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

Commit c27958d2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Controls - Custom icon/color issues" into rvc-qpr-dev am: 6095954e 

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

Change-Id: I5c53baac4419a8d38f00bf842d8ae8347ca19f03
parents e662938f 6095954e

packages/SystemUI/src/com/android/systemui/controls/management/ControlAdapter.kt

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ internal class ControlHolder( 
        val context = itemView.context

        val fg = context.getResources().getColorStateList(ri.foreground, context.getTheme())



        icon.imageTintList = null

        ci.customIcon?.let {

            icon.setImageIcon(it)

        } ?: run {

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

+5 −1
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ class ControlsUiControllerImpl @Inject constructor ( 
    private var hidden = true

    private lateinit var dismissGlobalActions: Runnable

    private val popupThemedContext = ContextThemeWrapper(context, R.style.Control_ListPopupWindow)

    private var retainCache = false



    private val collator = Collator.getInstance(context.resources.configuration.locales[0])

    private val localeComparator = compareBy<SelectionItem, CharSequence>(collator) {
@@ -149,6 +150,7 @@ class ControlsUiControllerImpl @Inject constructor ( 
        this.parent = parent

        this.dismissGlobalActions = dismissGlobalActions

        hidden = false

        retainCache = false



        allStructures = controlsController.get().getFavorites()

        selectedStructure = loadPreference(allStructures)
@@ -235,6 +237,8 @@ class ControlsUiControllerImpl @Inject constructor ( 
        }

        putIntentExtras(i, si)

        startActivity(context, i)



        retainCache = true

    }



    private fun putIntentExtras(intent: Intent, si: StructureInfo) {
@@ -497,7 +501,7 @@ class ControlsUiControllerImpl @Inject constructor ( 


        controlsListingController.get().removeCallback(listingCallback)



        RenderInfo.clearCache()

        if (!retainCache) RenderInfo.clearCache()

    }



    override fun onRefreshState(componentName: ComponentName, controls: List<Control>) {