commit e9714eb0c7c1d5dc9da82121b9a9c7aac37409f1
author Selim Cinek <cinek@google.com> Mon Mar 09 11:21:49 2020 -0700
committer Selim Cinek <cinek@google.com> Thu Mar 12 13:39:36 2020 -0700
tree 896e3bf8ca88d41a3bb9605ec694675822be062a
parent f2b8aa71d516449fd5e8bdf787f8c676feda2d61

Ensured correct coloring of badge in dark mode

Bug: 6701275011
Test: add conversation in darkmode, observe dark badge background
Change-Id: I88d9667d82a134233ff8c0c19f06dffdd5b16a67

core/java/android/app/Notification.java

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 4ef4cfa..d48e553 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -7525,6 +7525,9 @@
                     mBuilder.getPrimaryTextColor(p));
             contentView.setInt(R.id.status_bar_latest_event_content, "setMessageTextColor",
                     mBuilder.getSecondaryTextColor(p));
+            contentView.setInt(R.id.status_bar_latest_event_content,
+                    "setNotificationBackgroundColor",
+                    mBuilder.resolveBackgroundColor(p));
             contentView.setBoolean(R.id.status_bar_latest_event_content, "setIsCollapsed",
                     isCollapsed);
             contentView.setIcon(R.id.status_bar_latest_event_content, "setAvatarReplacement",

core/java/com/android/internal/widget/ConversationLayout.java

diff --git a/core/java/com/android/internal/widget/ConversationLayout.java b/core/java/com/android/internal/widget/ConversationLayout.java
index b38092d..5e94b71 100644
--- a/core/java/com/android/internal/widget/ConversationLayout.java
+++ b/core/java/com/android/internal/widget/ConversationLayout.java
@@ -24,6 +24,7 @@
 import android.app.Person;
 import android.app.RemoteInputHistoryItem;
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -526,6 +527,14 @@
         mSenderTextColor = color;
     }
 
+    /**
+     * @param color the color of the notification background
+     */
+    @RemotableViewMethod
+    public void setNotificationBackgroundColor(int color) {
+        mConversationIconBadge.setBackgroundTintList(ColorStateList.valueOf(color));
+    }
+
     @RemotableViewMethod
     public void setMessageTextColor(int color) {
         mMessageTextColor = color;

core/java/com/android/internal/widget/MessagingLayout.java

diff --git a/core/java/com/android/internal/widget/MessagingLayout.java b/core/java/com/android/internal/widget/MessagingLayout.java
index bb2faecf..ac6b174 100644
--- a/core/java/com/android/internal/widget/MessagingLayout.java
+++ b/core/java/com/android/internal/widget/MessagingLayout.java
@@ -382,6 +382,15 @@
         mSenderTextColor = color;
     }
 
+
+    /**
+     * @param color the color of the notification background
+     */
+    @RemotableViewMethod
+    public void setNotificationBackgroundColor(int color) {
+        // Nothing to do with this
+    }
+
     @RemotableViewMethod
     public void setMessageTextColor(int color) {
         mMessageTextColor = color;