commit cf895ccc2c7b0ca82f5ccde9f7cb78a8f7a0836e
author Tony Wickham <twickham@google.com> Thu Apr 20 22:13:20 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 20 22:13:20 2017 +0000
tree cfe678f3a07f62d1c99a3d16272dcb38a30d4a0e
parent f2d8b657755642cfc5803d1ee4b3abe53da304b5
parent 1788442dd1292b573093cf377bc5c18f331d2cde

Merge "Mutate system shortcut icons in popup before tinting" into ub-launcher3-dorval

src/com/android/launcher3/popup/SystemShortcut.java

diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java
index de88499..4ccee4a 100644
--- a/src/com/android/launcher3/popup/SystemShortcut.java
+++ b/src/com/android/launcher3/popup/SystemShortcut.java
@@ -31,7 +31,7 @@
     }
 
     public Drawable getIcon(Context context, int colorAttr) {
-        Drawable icon = context.getResources().getDrawable(mIconResId);
+        Drawable icon = context.getResources().getDrawable(mIconResId, context.getTheme()).mutate();
         icon.setTint(Themes.getAttrColor(context, colorAttr));
         return icon;
     }