Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a7e815d authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I3f5fbd0d0e2da9680b9f7b1550677495e5589a07
parents 19df2018 2020f93a

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) {