diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-09-08 19:45:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-08 19:45:37 +0000 |
| commit | 50418f7408cccd1429fe0170cc902fffb2f32a4e (patch) | |
| tree | 5915a02a0d7ce133c713a3e0260d8ed349679381 | |
| parent | 4d5f69f20e636523d69574d2f2073c998226eb8a (diff) | |
| parent | a3bb226b08b3a31233e3ba3c8b7925eec0e3314b (diff) | |
| download | frameworks_base-50418f7408cccd1429fe0170cc902fffb2f32a4e.zip frameworks_base-50418f7408cccd1429fe0170cc902fffb2f32a4e.tar.gz frameworks_base-50418f7408cccd1429fe0170cc902fffb2f32a4e.tar.bz2 | |
am 66d3891d: Merge "Fix invisible low prio notifications in SHADE_LOCKED" into lmp-dev
* commit '66d3891d1e8566944d4f86ba5df39b037f90573b':
Fix invisible low prio notifications in SHADE_LOCKED
| -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); |