diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-09-08 19:57:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-08 19:57:12 +0000 |
| commit | 8268ad6779c38fb67ea3783fd57bf71bb0cccc51 (patch) | |
| tree | a8f31fba9ba28c71b094640954338a52cafe1f96 /packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | |
| parent | 784a01f91668f3da7bb9e9747f32ac7f960bab4b (diff) | |
| parent | 50418f7408cccd1429fe0170cc902fffb2f32a4e (diff) | |
| download | frameworks_base-8268ad6779c38fb67ea3783fd57bf71bb0cccc51.zip frameworks_base-8268ad6779c38fb67ea3783fd57bf71bb0cccc51.tar.gz frameworks_base-8268ad6779c38fb67ea3783fd57bf71bb0cccc51.tar.bz2 | |
am dea85d3b: am 66d3891d: Merge "Fix invisible low prio notifications in SHADE_LOCKED" into lmp-dev
* commit 'dea85d3bba31024313a2eb9d98e2183710a0a04c':
Fix invisible low prio notifications in SHADE_LOCKED
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java')
| -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); |