From bae5ba39dd73b5d5c8ace0ce737d398c28dc44ff Mon Sep 17 00:00:00 2001
From: Gus Prevas <kprevas@google.com>
Date: Wed, 28 Nov 2018 15:45:13 -0500
Subject: Updates color and size of bell icon.

Test: manual
Bug: 116622974
Change-Id: I0419759e8f99f0a0b3d8b68f18f5a445680ec1af
---
 core/java/android/app/Notification.java              | 9 +++++++++
 core/res/res/layout/notification_template_header.xml | 1 -
 core/res/res/values/dimens.xml                       | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 16d35802a9f6..dabac733c609 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -4468,6 +4468,14 @@ public class Notification implements Parcelable
             }
         }
 
+        private void bindAlertedIcon(RemoteViews contentView, StandardTemplateParams p) {
+            contentView.setDrawableTint(
+                    R.id.alerted_icon,
+                    false /* targetBackground */,
+                    getNeutralColor(p),
+                    PorterDuff.Mode.SRC_ATOP);
+        }
+
         /**
          * @hide
          */
@@ -4870,6 +4878,7 @@ public class Notification implements Parcelable
                 bindHeaderTextSecondary(contentView, p);
                 bindHeaderChronometerAndTime(contentView, p);
                 bindProfileBadge(contentView, p);
+                bindAlertedIcon(contentView, p);
             }
             bindActivePermissions(contentView, p);
             bindExpandButton(contentView, p);
diff --git a/core/res/res/layout/notification_template_header.xml b/core/res/res/layout/notification_template_header.xml
index 433ae399c88c..4bf1ad6651ee 100644
--- a/core/res/res/layout/notification_template_header.xml
+++ b/core/res/res/layout/notification_template_header.xml
@@ -126,7 +126,6 @@
         android:visibility="gone"
         android:contentDescription="@string/notification_alerted_content_description"
         android:src="@drawable/ic_notifications_alerted"
-        android:tint="@color/notification_secondary_text_color_light"
     />
     <ImageView
         android:id="@+id/profile_badge"
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index f7b9961c39e8..05a156b69371 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -430,7 +430,7 @@
     <dimen name="notification_badge_size">12dp</dimen>
 
     <!-- Size of the alerted icon for notifications -->
-    <dimen name="notification_alerted_size">18dp</dimen>
+    <dimen name="notification_alerted_size">12dp</dimen>
 
     <!-- Keyguard dimensions -->
     <!-- TEMP -->
-- 
cgit v1.2.3-59-g8ed1b