commit acb0eeda9dded095facd0d8695c028a13bc9709f
author Lucas Dupin <dupin@google.com> Sat Mar 03 14:05:04 2018 -0800
committer Lucas Dupin <dupin@google.com> Mon Mar 05 17:23:29 2018 +0000
tree f5cc724d7e16574c75e6e26da25e546d656acf0a
parent 999e97f405b8f01b12a6fb8e844d33dc807813fa

Tint keyguard icons

Test: visual
Change-Id: I7915c4ad1cd4bcb852a7bdd68e9f57fda7f985c6
Fixes: 71599427
(cherry picked from commit 914b708645f3f183719dd53623900a1609c6579b)

packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
index 2adb286..7572512 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
@@ -179,7 +179,7 @@
                         / (float) iconDrawable.getIntrinsicHeight() * mIconSize);
                 iconDrawable.setBounds(0, 0, Math.max(width, 1), mIconSize);
             }
-            button.setCompoundDrawablesRelative(iconDrawable, null, null, null);
+            button.setCompoundDrawables(iconDrawable, null, null, null);
             button.setOnClickListener(this);
         }
 
@@ -338,5 +338,27 @@
             setMaxLines(1);
             setEllipsize(TruncateAt.END);
         }
+
+        @Override
+        public void setTextColor(int color) {
+            super.setTextColor(color);
+            updateDrawableColors();
+        }
+
+        @Override
+        public void setCompoundDrawables(Drawable left, Drawable top, Drawable right,
+                Drawable bottom) {
+            super.setCompoundDrawables(left, top, right, bottom);
+            updateDrawableColors();
+        }
+
+        private void updateDrawableColors() {
+            final int color = getCurrentTextColor();
+            for (Drawable drawable : getCompoundDrawables()) {
+                if (drawable != null) {
+                    drawable.setTint(color);
+                }
+            }
+        }
     }
 }