Merge "Controls UI - Fix icon tint for custom icons" into rvc-dev

2020-06-22 15:11:47 +00:00
parent c472565de6 d0ab4bec4f
commit 2020f93a13
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt
+++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt
@@ -413,7 +413,9 @@ class ControlViewHolder(

        control?.getCustomIcon()?.let {
            // do not tint custom icons, assume the intended icon color is correct
-            icon.imageTintList = null
+            if (icon.imageTintList != null) {
+                icon.imageTintList = null
+            }
            icon.setImageIcon(it)
        } ?: run {
            if (drawable is StateListDrawable) {