From 8b08b88640e1f847d4890399f236b434b08921c0 Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Fri, 12 Aug 2011 14:49:36 -0400 Subject: [PATCH] Properly disable status bar on secure lockscreens. (Broken implementation appeared in change I967e455.) Bug: 5158885 Change-Id: I0e22c269ff76d19bcdd5e51e1722e34fdc025dfa --- .../internal/policy/impl/KeyguardViewMediator.java | 9 +++++---- 1 file 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 4abb9eb973351..06b7fb912e970 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)); }