From c1f33694bc4241180b2b287cb8b40ebfe7125b96 Mon Sep 17 00:00:00 2001 From: Jeff DeCew Date: Fri, 7 May 2021 13:05:57 -0400 Subject: [PATCH] Use the accent color for colorized notifications with COLOR_DEFAULT Fixes: 187508265 Test: manual Change-Id: I2707468694c4932a8201bb8414637d8c2640caca --- core/java/android/app/Notification.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index ba0bc555eb57c..bd3fee0c6b305 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -5538,12 +5538,11 @@ public class Notification implements Parcelable /** * Determines if the notification should be colorized *for the purposes of applying colors*. - * If this is the minimized view of a colorized notification, or if the app did not provide - * a color to colorize with, this will return false so that internal coloring logic can - * still render the notification normally. + * If this is the minimized view of a colorized notification, this will return false so that + * internal coloring logic can still render the notification normally. */ private boolean isBackgroundColorized(StandardTemplateParams p) { - return p.allowColorization && mN.color != COLOR_DEFAULT && mN.isColorized(); + return p.allowColorization && mN.isColorized(); } private boolean isCallActionColorCustomizable() { @@ -5551,8 +5550,7 @@ public class Notification implements Parcelable // that is only used for disallowing colorization of headers for the minimized state, // and neither of those conditions applies when showing actions. // Not requiring StandardTemplateParams as an argument simplifies the creation process. - return mN.color != COLOR_DEFAULT && mN.isColorized() - && mContext.getResources().getBoolean( + return mN.isColorized() && mContext.getResources().getBoolean( R.bool.config_callNotificationActionColorsRequireColorized); }