diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-10-04 20:56:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-04 20:56:08 -0700 |
| commit | f5e2b2c26c37d839e6559319d311b62598c6dade (patch) | |
| tree | d9447574a8a87358ca19ecb370ed04c67362aecc /api | |
| parent | a07b1fffbe7c43485b35ba83c9083a59ff328df1 (diff) | |
| parent | 2d78490292090eeab84694330978c9ad7fad2d37 (diff) | |
| download | frameworks_base-f5e2b2c26c37d839e6559319d311b62598c6dade.zip frameworks_base-f5e2b2c26c37d839e6559319d311b62598c6dade.tar.gz frameworks_base-f5e2b2c26c37d839e6559319d311b62598c6dade.tar.bz2 | |
Merge "DreamService API revisions." into jb-mr1-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/17.txt | 5 | ||||
| -rw-r--r-- | api/current.txt | 5 |
2 files changed, 6 insertions, 4 deletions
@@ -20342,7 +20342,7 @@ package android.service.dreams { method public boolean dispatchTouchEvent(android.view.MotionEvent); method public boolean dispatchTrackballEvent(android.view.MotionEvent); method public android.view.View findViewById(int); - method public void finish(); + method public final void finish(); method public android.view.Window getWindow(); method public android.view.WindowManager getWindowManager(); method public boolean isFullscreen(); @@ -20357,12 +20357,13 @@ package android.service.dreams { method public boolean onCreatePanelMenu(int, android.view.Menu); method public android.view.View onCreatePanelView(int); method public void onDetachedFromWindow(); + method public void onDreamingStarted(); + method public void onDreamingStopped(); method public boolean onMenuItemSelected(int, android.view.MenuItem); method public boolean onMenuOpened(int, android.view.Menu); method public void onPanelClosed(int, android.view.Menu); method public boolean onPreparePanel(int, android.view.View, android.view.Menu); method public boolean onSearchRequested(); - method public void onStart(); method public void onWindowAttributesChanged(android.view.WindowManager.LayoutParams); method public void onWindowFocusChanged(boolean); method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback); diff --git a/api/current.txt b/api/current.txt index 00e84db..91dc71f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -20342,7 +20342,7 @@ package android.service.dreams { method public boolean dispatchTouchEvent(android.view.MotionEvent); method public boolean dispatchTrackballEvent(android.view.MotionEvent); method public android.view.View findViewById(int); - method public void finish(); + method public final void finish(); method public android.view.Window getWindow(); method public android.view.WindowManager getWindowManager(); method public boolean isFullscreen(); @@ -20357,12 +20357,13 @@ package android.service.dreams { method public boolean onCreatePanelMenu(int, android.view.Menu); method public android.view.View onCreatePanelView(int); method public void onDetachedFromWindow(); + method public void onDreamingStarted(); + method public void onDreamingStopped(); method public boolean onMenuItemSelected(int, android.view.MenuItem); method public boolean onMenuOpened(int, android.view.Menu); method public void onPanelClosed(int, android.view.Menu); method public boolean onPreparePanel(int, android.view.View, android.view.Menu); method public boolean onSearchRequested(); - method public void onStart(); method public void onWindowAttributesChanged(android.view.WindowManager.LayoutParams); method public void onWindowFocusChanged(boolean); method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback); |