diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-09-08 19:34:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-08 19:34:44 +0000 |
| commit | a3bb226b08b3a31233e3ba3c8b7925eec0e3314b (patch) | |
| tree | fda60290960fcd0e2ba86e905cfad6d39208980b /packages | |
| parent | 9f8c80df1dbaf927888842775e9cfdda55dbe30a (diff) | |
| parent | 9261b3b7782000f4db8fbf96e61f34d5f5833bc3 (diff) | |
| download | frameworks_base-a3bb226b08b3a31233e3ba3c8b7925eec0e3314b.zip frameworks_base-a3bb226b08b3a31233e3ba3c8b7925eec0e3314b.tar.gz frameworks_base-a3bb226b08b3a31233e3ba3c8b7925eec0e3314b.tar.bz2 | |
Merge "Fix invisible low prio notifications in SHADE_LOCKED" into lmp-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 1c4556f..e490359 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -1625,7 +1625,7 @@ public abstract class BaseStatusBar extends SystemUI implements } } boolean showOnKeyguard = shouldShowOnKeyguard(entry.notification); - if ((isLockscreenPublicMode() && !showOnKeyguard) || + if ((isLockscreenPublicMode() && !mShowLockscreenNotifications) || (onKeyguard && (visibleNotifications >= maxKeyguardNotifications || !showOnKeyguard))) { entry.row.setVisibility(View.GONE); |