Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Properly disable status bar on secure lockscreens."

Browse Source
This commit is contained in:
Daniel Sandler
2011-08-12 12:56:44 -07:00
committed by Android (Google) Code Review
parent c498ad6eac 8b08b88640
commit e1fec2408b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
View File

@@ -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));
}