diff options
author | 2013-11-12 01:28:40 +0000 | |
---|---|---|
committer | 2013-11-12 01:28:41 +0000 | |
commit | 778eaf4bece18d08e91df1d405337a18c3abcd57 (patch) | |
tree | ee4532b1363d0954eab71f2b3bde2111fe64fcd6 | |
parent | 09e7e0ef8bcd8b7b78b79fb570de2032871f0c97 (diff) | |
parent | f92b6161b88a9215e8bde0a83084ce4ae6ec1ccc (diff) |
Merge "Disallow transient status bar on the keyguard." into klp-dev
-rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 8bb4a6cbb832..c33bd3546aba 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3468,6 +3468,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { } // Maintain fullscreen layout until incoming animation is complete. topIsFullscreen = mTopIsFullscreen && mStatusBar.isAnimatingLw(); + // Transient status bar on the lockscreen is not allowed + if (mForceStatusBarFromKeyguard && mStatusBarController.isTransientShowing()) { + mStatusBarController.updateVisibilityLw(false /*transientAllowed*/, + mLastSystemUiFlags, mLastSystemUiFlags); + } } else if (mTopFullscreenOpaqueWindowState != null) { if (localLOGV) { Slog.d(TAG, "frame: " + mTopFullscreenOpaqueWindowState.getFrameLw() |