commit 4aad455280dd19a3097e8fad3f68bfee1de30327
author Adrian Roos <roosa@google.com> Tue Jun 28 13:16:15 2016 -0700
committer Adrian Roos <roosa@google.com> Tue Jun 28 13:21:25 2016 -0700
tree 96e3458459ecfe948e7754f7a14bb1c4e4a7bfb3
parent 41f0e20739842d0d7b9b746dc23ce36e1867a476

Notification icons: Correctly apply color filter for DrawableContainers

Change-Id: I3d101c717c414786817c2139ed68a8ee3fd09241
Fixes: 29824236

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java
index 7794d5b..3e4c758 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java
@@ -240,7 +240,11 @@
         // Also, the notification might have been modified during the animation, so background
         // might be null here.
         if (iconDrawable != null) {
-            iconDrawable.mutate().setColorFilter(mIconColorFilter);
+            Drawable d = iconDrawable.mutate();
+            // DrawableContainer ignores the color filter if it's already set, so clear it first to
+            // get it set and invalidated properly.
+            d.setColorFilter(null);
+            d.setColorFilter(mIconColorFilter);
         }
     }