Skip to content

Commit f5e2b2c

Browse files
dsandlerAndroid (Google) Code Review
authored andcommitted
Merge "DreamService API revisions." into jb-mr1-dev
2 parents a07b1ff + 2d78490 commit f5e2b2c

File tree

7 files changed

+178
-105
lines changed

7 files changed

+178
-105
lines changed

api/17.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20342,7 +20342,7 @@ package android.service.dreams {
2034220342
method public boolean dispatchTouchEvent(android.view.MotionEvent);
2034320343
method public boolean dispatchTrackballEvent(android.view.MotionEvent);
2034420344
method public android.view.View findViewById(int);
20345-
method public void finish();
20345+
method public final void finish();
2034620346
method public android.view.Window getWindow();
2034720347
method public android.view.WindowManager getWindowManager();
2034820348
method public boolean isFullscreen();
@@ -20357,12 +20357,13 @@ package android.service.dreams {
2035720357
method public boolean onCreatePanelMenu(int, android.view.Menu);
2035820358
method public android.view.View onCreatePanelView(int);
2035920359
method public void onDetachedFromWindow();
20360+
method public void onDreamingStarted();
20361+
method public void onDreamingStopped();
2036020362
method public boolean onMenuItemSelected(int, android.view.MenuItem);
2036120363
method public boolean onMenuOpened(int, android.view.Menu);
2036220364
method public void onPanelClosed(int, android.view.Menu);
2036320365
method public boolean onPreparePanel(int, android.view.View, android.view.Menu);
2036420366
method public boolean onSearchRequested();
20365-
method public void onStart();
2036620367
method public void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);
2036720368
method public void onWindowFocusChanged(boolean);
2036820369
method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);

api/current.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20342,7 +20342,7 @@ package android.service.dreams {
2034220342
method public boolean dispatchTouchEvent(android.view.MotionEvent);
2034320343
method public boolean dispatchTrackballEvent(android.view.MotionEvent);
2034420344
method public android.view.View findViewById(int);
20345-
method public void finish();
20345+
method public final void finish();
2034620346
method public android.view.Window getWindow();
2034720347
method public android.view.WindowManager getWindowManager();
2034820348
method public boolean isFullscreen();
@@ -20357,12 +20357,13 @@ package android.service.dreams {
2035720357
method public boolean onCreatePanelMenu(int, android.view.Menu);
2035820358
method public android.view.View onCreatePanelView(int);
2035920359
method public void onDetachedFromWindow();
20360+
method public void onDreamingStarted();
20361+
method public void onDreamingStopped();
2036020362
method public boolean onMenuItemSelected(int, android.view.MenuItem);
2036120363
method public boolean onMenuOpened(int, android.view.Menu);
2036220364
method public void onPanelClosed(int, android.view.Menu);
2036320365
method public boolean onPreparePanel(int, android.view.View, android.view.Menu);
2036420366
method public boolean onSearchRequested();
20365-
method public void onStart();
2036620367
method public void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);
2036720368
method public void onWindowFocusChanged(boolean);
2036820369
method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);

core/java/android/service/dreams/Dream.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)