summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src
diff options
context:
space:
mode:
authord34d <clark@cyngn.com>2016-03-02 12:58:53 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-03-08 13:06:07 -0800
commit4fa29056b5ffa00400764a5053b78c9ad1f2e6f6 (patch)
tree17517b34f888c63a4b35495710d1abda6e5b6ead /packages/SystemUI/src
parent53886b098f3522a306d5f4a84531fdf8223d84a1 (diff)
downloadframeworks_base-4fa29056b5ffa00400764a5053b78c9ad1f2e6f6.zip
frameworks_base-4fa29056b5ffa00400764a5053b78c9ad1f2e6f6.tar.gz
frameworks_base-4fa29056b5ffa00400764a5053b78c9ad1f2e6f6.tar.bz2
SysUI: Fix hiding per-app sensitive notifications
This fixes an issue introduced in Ic0f6e01cf7c09d4f8ed7e8735158a6fc093b8dcc where the user has show all notifications enabled and has turned on hiding of sensitive notifications for specific apps, but those notifications still show all content. Change-Id: Ia00a6acdacfa81e0b54224655c3d81d6a4f56518 TICKET: CYNGNOS-2176
Diffstat (limited to 'packages/SystemUI/src')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java4
1 files changed, 2 insertions, 2 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 954bd53..2d7fddc 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -4543,8 +4543,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
public void updateStackScrollerState(boolean goingToFullShade) {
if (mStackScroller == null) return;
boolean onKeyguard = mState == StatusBarState.KEYGUARD;
- mStackScroller.setHideSensitive(onKeyguard
- && !userAllowsPrivateNotificationsInPublic(mCurrentUserId), goingToFullShade);
+ mStackScroller.setHideSensitive(isLockscreenPublicMode()
+ || !userAllowsPrivateNotificationsInPublic(mCurrentUserId), goingToFullShade);
mStackScroller.setDimmed(onKeyguard, false /* animate */);
mStackScroller.setExpandingEnabled(!onKeyguard);
ActivatableNotificationView activatedChild = mStackScroller.getActivatedChild();