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

Commit 90e30314 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge "[Chipbar] Correctly bind icon color for chipbar." into main

parents 787addce e2044dde

packages/SystemUI/src/com/android/systemui/common/ui/binder/TintedIconViewBinder.kt

+2 −6
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.common.ui.binder



import android.widget.ImageView

import com.android.settingslib.Utils

import com.android.systemui.common.shared.model.TintedIcon



object TintedIconViewBinder {
@@ -27,14 +26,11 @@ object TintedIconViewBinder { 
     * [TintedIcon.tint] will always be applied, meaning that if it is null, then the tint *will* be

     * reset to null.

     */

    fun bind(

        tintedIcon: TintedIcon,

        view: ImageView,

    ) {

    fun bind(tintedIcon: TintedIcon, view: ImageView) {

        IconViewBinder.bind(tintedIcon.icon, view)

        view.imageTintList =

            if (tintedIcon.tint != null) {

                Utils.getColorAttr(view.context, tintedIcon.tint)

                view.context.getColorStateList(tintedIcon.tint)

            } else {

                null

            }