commit da30a03d96346a9c02463095f5efbf4a64bfac6d
author Jorim Jaggi <jjaggi@google.com> Fri Sep 05 15:11:46 2014 +0200
committer Jorim Jaggi <jjaggi@google.com> Fri Sep 05 15:13:39 2014 +0200
tree 8e268d66b8cc5d3531d3ac8c9522157a12ad2264
parent 038839e9475b81abfe6fcfbec6c86647bd7592b1

Hide notifications when occluded and disabled on keyguard

Bug: 17371021
Change-Id: I27769a2334285fe753a3ee5ce55986d4fd23b83c

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index 2c1d70d..e44f515 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -1623,10 +1623,11 @@
                 }
             }
             boolean showOnKeyguard = shouldShowOnKeyguard(entry.notification);
-            if (onKeyguard && (visibleNotifications >= maxKeyguardNotifications
-                    || !showOnKeyguard)) {
+            if ((isLockscreenPublicMode() && !showOnKeyguard) ||
+                    (onKeyguard && (visibleNotifications >= maxKeyguardNotifications
+                            || !showOnKeyguard))) {
                 entry.row.setVisibility(View.GONE);
-                if (showOnKeyguard) {
+                if (onKeyguard && showOnKeyguard) {
                     mKeyguardIconOverflowContainer.getIconsView().addNotification(entry);
                 }
             } else {