commit 720f686fe34374539928033fdc9af53668314aaf
author Matt Pietal <mpietal@google.com> Mon Jun 22 15:19:48 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 22 15:19:48 2020 +0000
tree 94976667b056bc9fa6853496f2e7f32202101325
parent 313ff21f03f9a3934c6b690306016796fa09fb07
parent 2020f93a13f740814dcdc465b1f3364608da677e

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953738

Change-Id: Ib025e75dc80a813820991ecc17398f98632d821f

packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt

diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt
index 865a38a..0e4f684 100644
--- 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 @@
 
         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) {