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

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

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

Change-Id: I5c53baac4419a8d38f00bf842d8ae8347ca19f03
This commit is contained in:
TreeHugger Robot
2020-09-18 14:18:46 +00:00
committed by Automerger Merge Worker
parent e662938fdf 6095954e6d
commit c27958d2dd
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -263,6 +263,7 @@ internal class ControlHolder(
val context = itemView.context val context = itemView.context
val fg = context.getResources().getColorStateList(ri.foreground, context.getTheme()) val fg = context.getResources().getColorStateList(ri.foreground, context.getTheme())
icon.imageTintList = null
ci.customIcon?.let { ci.customIcon?.let {
icon.setImageIcon(it) icon.setImageIcon(it)
} ?: run { } ?: run {

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

@@ -104,6 +104,7 @@ class ControlsUiControllerImpl @Inject constructor (
private var hidden = true private var hidden = true
private lateinit var dismissGlobalActions: Runnable private lateinit var dismissGlobalActions: Runnable
private val popupThemedContext = ContextThemeWrapper(context, R.style.Control_ListPopupWindow) 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 collator = Collator.getInstance(context.resources.configuration.locales[0])
private val localeComparator = compareBy<SelectionItem, CharSequence>(collator) { private val localeComparator = compareBy<SelectionItem, CharSequence>(collator) {
@@ -149,6 +150,7 @@ class ControlsUiControllerImpl @Inject constructor (
this.parent = parent this.parent = parent
this.dismissGlobalActions = dismissGlobalActions this.dismissGlobalActions = dismissGlobalActions
hidden = false hidden = false
retainCache = false
allStructures = controlsController.get().getFavorites() allStructures = controlsController.get().getFavorites()
selectedStructure = loadPreference(allStructures) selectedStructure = loadPreference(allStructures)
@@ -235,6 +237,8 @@ class ControlsUiControllerImpl @Inject constructor (
} }
putIntentExtras(i, si) putIntentExtras(i, si)
startActivity(context, i) startActivity(context, i)
retainCache = true
} }
private fun putIntentExtras(intent: Intent, si: StructureInfo) { private fun putIntentExtras(intent: Intent, si: StructureInfo) {
@@ -497,7 +501,7 @@ class ControlsUiControllerImpl @Inject constructor (
controlsListingController.get().removeCallback(listingCallback) controlsListingController.get().removeCallback(listingCallback)
RenderInfo.clearCache() if (!retainCache) RenderInfo.clearCache()
} }
override fun onRefreshState(componentName: ComponentName, controls: List<Control>) { override fun onRefreshState(componentName: ComponentName, controls: List<Control>) {