From 4bae644417af82a425891620448c6fabaeebce75 Mon Sep 17 00:00:00 2001 From: Beverly Date: Thu, 4 Apr 2019 09:59:33 -0400 Subject: [PATCH] Don't show dnd suppressed icons on aod The aod icons are from the shelf. When DND is suppressing status bar icons and aod is on (mFullyDark), still don't show the icons that would show on AOD (if DND wasn't on). Test: manual Test: atest NotificationIconAreaControllerTest Fixes: 122636236 Change-Id: I4680ea1c88427207274da48a6ab69f0c00a3ac69 --- .../statusbar/phone/NotificationIconAreaController.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java index 99269cf171416..02ee2433d251d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java @@ -215,16 +215,13 @@ public class NotificationIconAreaController implements DarkReceiver, if (entry.isRowDismissed() && hideDismissed) { return false; } - if (hideRepliedMessages && entry.isLastMessageFromReply()) { return false; } - // showAmbient == show in shade but not shelf - if (!showAmbient && entry.shouldSuppressStatusBar()) { + if ((!showAmbient || mFullyDark) && entry.shouldSuppressStatusBar()) { return false; } - return true; }