From 6baed9e3a272b09e87f15801a389d7714d0b051f Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Wed, 25 May 2016 16:05:09 -0700 Subject: [PATCH] Parent notifications should always be normal notification color Notification groups would use the background color of their children in some cases. This changes it so that parent notifications always use the normal notification color. Change-Id: I0638f94e044da2ba65a921f0c4a538941c001ca7 Fixes: 28613919 --- .../android/systemui/statusbar/ExpandableNotificationRow.java | 1 + .../statusbar/notification/NotificationCustomViewWrapper.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java index 0a28331e03e71..9ff87e23059d0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java @@ -1131,6 +1131,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { mChildrenContainer.recreateNotificationHeader(mExpandClickListener, mEntry.notification); } + getShowingLayout().updateBackgroundColor(false /* animate */); mPrivateLayout.updateExpandButtons(isExpandable()); updateChildrenHeaderAppearance(); updateChildrenVisibility(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationCustomViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationCustomViewWrapper.java index 61df44acbc508..85e87ddc84dfc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationCustomViewWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationCustomViewWrapper.java @@ -127,7 +127,8 @@ public class NotificationCustomViewWrapper extends NotificationViewWrapper { @Override public int getCustomBackgroundColor() { - return mBackgroundColor; + // Parent notifications should always use the normal background color + return mRow.isSummaryWithChildren() ? 0 : mBackgroundColor; } @Override