diff options
| author | John Spurlock <jspurlock@google.com> | 2013-04-11 16:55:12 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2013-04-12 11:43:49 -0400 |
| commit | 3733c4c2fec9f69d48a13a82d5bade3926248efa (patch) | |
| tree | 7a31db8a3b44f4f9481ec55ea679ff53cde2b5af | |
| parent | 869d273503adbccfae3bac7425649f2e1d2aefad (diff) | |
| download | frameworks_base-3733c4c2fec9f69d48a13a82d5bade3926248efa.zip frameworks_base-3733c4c2fec9f69d48a13a82d5bade3926248efa.tar.gz frameworks_base-3733c4c2fec9f69d48a13a82d5bade3926248efa.tar.bz2 | |
FLAG_DISMISS_KEYGUARD should not hide status bar if secure.
Otherwise, setting both FLAG_DISMISS_KEYGUARD + FLAG_FULLSCREEN
will hide the status bar (by not forcing it) when the secure
keyguard is showing.
Bug:8567697
Change-Id: I441d9c1bc0e106672b6d29427d291f41eaf1e697
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 273ac31..7cb6b09 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3204,7 +3204,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { mDismissKeyguard = mWinDismissingKeyguard == win ? DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START; mWinDismissingKeyguard = win; - mForceStatusBarFromKeyguard = false; + mForceStatusBarFromKeyguard = + mShowingLockscreen && mKeyguardMediator.isSecure(); } if ((attrs.flags & FLAG_ALLOW_LOCK_WHILE_SCREEN_ON) != 0) { mAllowLockscreenWhenOn = true; |