summaryrefslogtreecommitdiffstats
path: root/policy/src
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-11-11 15:01:16 -0500
committerJohn Spurlock <jspurlock@google.com>2013-11-11 15:01:16 -0500
commitf92b6161b88a9215e8bde0a83084ce4ae6ec1ccc (patch)
treece6157dbe4d6b917539c5f3bb3260a9cf05c5625 /policy/src
parente45d8b2dab33de18bef5cc5ae7db37b890b22d8d (diff)
downloadframeworks_base-f92b6161b88a9215e8bde0a83084ce4ae6ec1ccc.zip
frameworks_base-f92b6161b88a9215e8bde0a83084ce4ae6ec1ccc.tar.gz
frameworks_base-f92b6161b88a9215e8bde0a83084ce4ae6ec1ccc.tar.bz2
Disallow transient status bar on the keyguard.
FLAG_FULLSCREEN on the app under the keyguard was keeping the transient status bar visible if the user locked while revealing it. Bug:11629810 Change-Id: I034d3a4f4fe5463702253a1fca6d32debd520c3c
Diffstat (limited to 'policy/src')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java5
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 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 @@ 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()