Merge "Initial support for notification panel access in keyguard."

1 files changed, 7 insertions, 1 deletions

diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
index ee6d2ee4c74a..4abb9eb97335 100644
--- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
+++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
@@ -143,6 +143,12 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
      */
     private static final int KEYGUARD_DONE_DRAWING_TIMEOUT_MS = 2000;
 
+    /**
+     * Allow the user to operate the status bar when the keyguard is engaged (without a pattern or
+     * password).
+     */
+    private static final boolean ENABLE_STATUS_BAR_IN_KEYGUARD = true;
+
     private Context mContext;
     private AlarmManager mAlarmManager;
     private StatusBarManager mStatusBarManager;
@@ -1137,7 +1143,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
             boolean enable = !mShowing || (mHidden && !isSecure());
             mStatusBarManager.disable(enable ?
                          StatusBarManager.DISABLE_NONE :
-                         ( StatusBarManager.DISABLE_EXPAND
+                         ( (ENABLE_STATUS_BAR_IN_KEYGUARD ? 0 : StatusBarManager.DISABLE_EXPAND)
                          | StatusBarManager.DISABLE_NAVIGATION
                          | StatusBarManager.DISABLE_CLOCK));
         }