summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2014-05-06 20:27:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-06 20:27:23 +0000
commitf14f0a6cf46dcaeba6b8b1c5a1609b051bc457bb (patch)
tree83254e78591af1b19b1b1b8d70edb5311bc3fa33 /api
parent928a0632e5d9a82e176f0b3571241fbf70765952 (diff)
parent5f97930fc5dd44fcf1864acd53401c00b4de3a24 (diff)
downloadframeworks_base-f14f0a6cf46dcaeba6b8b1c5a1609b051bc457bb.zip
frameworks_base-f14f0a6cf46dcaeba6b8b1c5a1609b051bc457bb.tar.gz
frameworks_base-f14f0a6cf46dcaeba6b8b1c5a1609b051bc457bb.tar.bz2
am 7f85f16c: am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev
* commit '7f85f16c7d131699bef67aff6a107ce622e65b8d': onWindowDismissed API cleanup
Diffstat (limited to 'api')
-rw-r--r--api/current.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt
index 93dfc19..f66613b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -3306,7 +3306,6 @@ package android.app {
method public void onUserInteraction();
method protected void onUserLeaveHint();
method public void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);
- method public void onWindowDismissed();
method public void onWindowFocusChanged(boolean);
method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);
method public void openContextMenu(android.view.View);
@@ -3862,7 +3861,6 @@ package android.app {
method public boolean onTouchEvent(android.view.MotionEvent);
method public boolean onTrackballEvent(android.view.MotionEvent);
method public void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);
- method public void onWindowDismissed();
method public void onWindowFocusChanged(boolean);
method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);
method public void openContextMenu(android.view.View);
@@ -25032,7 +25030,6 @@ package android.service.dreams {
method public boolean onPreparePanel(int, android.view.View, android.view.Menu);
method public boolean onSearchRequested();
method public void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);
- method public void onWindowDismissed();
method public void onWindowFocusChanged(boolean);
method public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);
method public void setContentView(int);
@@ -31840,7 +31837,6 @@ package android.view {
method public abstract boolean onPreparePanel(int, android.view.View, android.view.Menu);
method public abstract boolean onSearchRequested();
method public abstract void onWindowAttributesChanged(android.view.WindowManager.LayoutParams);
- method public abstract void onWindowDismissed();
method public abstract void onWindowFocusChanged(boolean);
method public abstract android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);
}