| commit | ed50e94d6c47a99c9dae0b950a258c074576493e | [log] [tgz] |
|---|---|---|
| author | Dan Sandler <dsandler@android.com> | Thu Jun 05 20:04:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 05 20:04:36 2014 +0000 |
| tree | 4dfdb8f7f9fc195756562329ba608e6adcaaf055 | |
| parent | 6be08229aed4101b309c4da31303554ebfa0326c [diff] | |
| parent | 71f507bbe9a6700f80389423507212973a2fc43f [diff] |
am 4ccaa092: Merge "Don\'t show private notifications if a secure lockscreen is merely occluded." into lmp-preview-dev * commit '4ccaa092d49deb84885b5daf2e6d6f1c745d56bf': Don't show private notifications if a secure lockscreen is merely occluded.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index d9005d8..82134a5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -2850,7 +2850,9 @@ } private void updatePublicMode() { - setLockscreenPublicMode(mState == StatusBarState.KEYGUARD + setLockscreenPublicMode( + (mStatusBarKeyguardViewManager.isShowing() || + mStatusBarKeyguardViewManager.isOccluded()) && mStatusBarKeyguardViewManager.isSecure()); }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index e3145a6..09e4d94 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -181,6 +181,10 @@ reset(); } + public boolean isOccluded() { + return mOccluded; + } + /** * Hides the keyguard view */