Commit da871a64 authored Jun 22, 2020 by Matt Pietal Committed by Automerger Merge Worker Jun 22, 2020

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

Merge "Controls UI - Fix icon tint for custom icons" into rvc-dev am: 2020f93a am: 720f686f am: fd844443 am: 22774084

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

Change-Id: Ia5aa1181cceefa4342a31406150af2253df4c2a6

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -413,7 +413,9 @@ class ControlViewHolder(

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