diff options
| author | John Spurlock <jspurlock@google.com> | 2014-07-11 10:13:46 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2014-07-11 10:15:25 -0400 |
| commit | 08ffcf530184dc0a67c184edcb51d81d41d4d818 (patch) | |
| tree | 8305b1fa234200db3417e32c323b6d990d4ff8de /policy | |
| parent | d05f67f9721e1f9194a1f57cf7481b4be65366b3 (diff) | |
| download | frameworks_base-08ffcf530184dc0a67c184edcb51d81d41d4d818.zip frameworks_base-08ffcf530184dc0a67c184edcb51d81d41d4d818.tar.gz frameworks_base-08ffcf530184dc0a67c184edcb51d81d41d4d818.tar.bz2 | |
If status bar is the keyguard, allow clearing vis flags.
The policy around leaving flags alone when the user
is interacting the status bar is not applicable when
the status bar is acting as the keyguard.
Bug:14913124
Change-Id: I96b4b707abce71f77ac2acb6f4086df661f5a25c
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 28f7a0f..ef15a80 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -5506,12 +5506,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { // prevent status bar interaction from clearing certain flags boolean statusBarHasFocus = win.getAttrs().type == TYPE_STATUS_BAR; - if (statusBarHasFocus) { + if (statusBarHasFocus && !isStatusBarKeyguard()) { int flags = View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY; - if (!isStatusBarKeyguard() || mHideLockScreen) { + if (mHideLockScreen) { flags |= View.STATUS_BAR_TRANSLUCENT | View.NAVIGATION_BAR_TRANSLUCENT; } vis = (vis & ~flags) | (oldVis & flags); |