commit 778eaf4bece18d08e91df1d405337a18c3abcd57
author John Spurlock <jspurlock@google.com> Tue Nov 12 01:28:40 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 12 01:28:41 2013 +0000
tree ee4532b1363d0954eab71f2b3bde2111fe64fcd6
parent 09e7e0ef8bcd8b7b78b79fb570de2032871f0c97
parent f92b6161b88a9215e8bde0a83084ce4ae6ec1ccc

Merge "Disallow transient status bar on the keyguard." into klp-dev

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 8bb4a6c..c33bd35 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 @@
                 }
                 // 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()