diff options
| author | Dan Sandler <dsandler@android.com> | 2014-06-05 00:58:02 -0400 |
|---|---|---|
| committer | Dan Sandler <dsandler@android.com> | 2014-06-05 03:04:34 -0400 |
| commit | 4b22bdfa84eb3b62f83982281798145e56fce21d (patch) | |
| tree | 8db6eefbdb644b2f5ccd4ba296931ba62d0c685b /packages | |
| parent | 7256a852cee3a656615af19ebeb3ad7379a194fb (diff) | |
| download | frameworks_base-4b22bdfa84eb3b62f83982281798145e56fce21d.zip frameworks_base-4b22bdfa84eb3b62f83982281798145e56fce21d.tar.gz frameworks_base-4b22bdfa84eb3b62f83982281798145e56fce21d.tar.bz2 | |
Don't show private notifications if a secure lockscreen is merely occluded.
Bug: 15430088
Change-Id: I27187216462b5bb7d52c3f85b9444348138fd9ea
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java | 4 |
2 files changed, 7 insertions, 1 deletions
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 e55de94..1dfb8fa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -2851,7 +2851,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } 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 @@ public class StatusBarKeyguardViewManager { reset(); } + public boolean isOccluded() { + return mOccluded; + } + /** * Hides the keyguard view */ |