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

Commit 22774084 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:... 

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

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

Change-Id: I095d2d7b52c4f9d5f8fde75a4c89ebaaef2b7064
parents e14338fb fd844443

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