diff options
| author | Craig Mautner <cmautner@google.com> | 2014-09-12 01:45:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-12 01:45:29 +0000 |
| commit | cbc771f50e998ec307c7e92009425c730cde49c5 (patch) | |
| tree | 16ab88dd394d3c3731dc83ae82f13cb2b55253e8 /core/java/android/view | |
| parent | 3bab7c188d5e823484eda5c0f3df7759ce4a6c98 (diff) | |
| parent | 7d7808fcf8e6a1c27d52375210f9da2705d5f590 (diff) | |
| download | frameworks_base-cbc771f50e998ec307c7e92009425c730cde49c5.zip frameworks_base-cbc771f50e998ec307c7e92009425c730cde49c5.tar.gz frameworks_base-cbc771f50e998ec307c7e92009425c730cde49c5.tar.bz2 | |
Merge changes Ia6fe9724,I682b9acb into lmp-dev
* changes:
Show all windows from activity that hides keyguard
Make sure FLAG_DISMISS_KEYGUARD brings up bouncer
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/WindowManagerPolicy.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java index 2ed125d..fec7550 100644 --- a/core/java/android/view/WindowManagerPolicy.java +++ b/core/java/android/view/WindowManagerPolicy.java @@ -638,6 +638,11 @@ public interface WindowManagerPolicy { public boolean canBeForceHidden(WindowState win, WindowManager.LayoutParams attrs); /** + * Return the window that is hiding the keyguard, if such a thing exists. + */ + public WindowState getWinShowWhenLockedLw(); + + /** * Called when the system would like to show a UI to indicate that an * application is starting. You can use this to add a * APPLICATION_STARTING_TYPE window with the given appToken to the window |