Merge "Controls UI - Fix icon tint for custom icons" into rvc-dev am: 2020f93a13 am: 9a7e815d0a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953738 Change-Id: Ie9caab8537aae8bff51fd2642687803f9fb9fa78
2020-06-22 15:27:03 +00:00
parent 6f73cb42e5 9a7e815d0a
commit a7004a53d5
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) {