Merge "Properly disable status bar on secure lockscreens."

1 files changed, 5 insertions, 4 deletions

diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
index 4abb9eb97335..06b7fb912e97 100644
--- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
+++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
@@ -1138,12 +1138,13 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
                 }
             }
 
-            // if the keyguard is shown, allow the status bar to open
-            // only if the keyguard is insecure and is covered by another window
-            boolean enable = !mShowing || (mHidden && !isSecure());
+            // if the keyguard is shown, allow the status bar to open only if the keyguard is
+            // insecure and (is covered by another window OR this feature is enabled in general)
+            boolean enable = !mShowing
+                || ((ENABLE_STATUS_BAR_IN_KEYGUARD || mHidden) && !isSecure());
             mStatusBarManager.disable(enable ?
                          StatusBarManager.DISABLE_NONE :
-                         ( (ENABLE_STATUS_BAR_IN_KEYGUARD ? 0 : StatusBarManager.DISABLE_EXPAND)
+                         ( StatusBarManager.DISABLE_EXPAND
                          | StatusBarManager.DISABLE_NAVIGATION
                          | StatusBarManager.DISABLE_CLOCK));
         }