Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I0e0aa00330cfee041a3282b0774ab360e766ed74
This commit is contained in:
Matt Pietal
2020-06-22 15:25:52 +00:00
committed by Automerger Merge Worker
parent aa70e402a2 720f686fe3
commit fd844443cd
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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