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

Merge "Controls UI - Fix title icon" into rvc-dev

Browse Source
This commit is contained in:
Matt Pietal
2020-03-04 18:52:35 +00:00
committed by Android (Google) Code Review
parent aa3a470151 aaccdbee8a
commit 5338509b9d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,8 +293,13 @@ class ControlsUiControllerImpl @Inject constructor (
* for this dialog. Use a textView with the ListPopupWindow to achieve * for this dialog. Use a textView with the ListPopupWindow to achieve
* a similar effect * a similar effect
*/ */
val item = adapter.findSelectionItem(selectedStructure) ?: adapter.getItem(0)
parent.requireViewById<TextView>(R.id.app_or_structure_spinner).apply { parent.requireViewById<TextView>(R.id.app_or_structure_spinner).apply {
setText((adapter.findSelectionItem(selectedStructure) ?: adapter.getItem(0)).getTitle()) setText(item.getTitle())
}
parent.requireViewById<ImageView>(R.id.app_icon).apply {
setContentDescription(item.getTitle())
setImageDrawable(item.icon)
} }
val anchor = parent.requireViewById<ViewGroup>(R.id.controls_header) val anchor = parent.requireViewById<ViewGroup>(R.id.controls_header)
anchor.setOnClickListener(object : View.OnClickListener { anchor.setOnClickListener(object : View.OnClickListener {
@@ -330,11 +335,6 @@ class ControlsUiControllerImpl @Inject constructor (
} }
} }
}) })
parent.requireViewById<ImageView>(R.id.app_icon).apply {
setContentDescription("My Home")
setImageDrawable(items[0].icon)
}
} }
private fun loadPreference(structures: List<StructureInfo>): StructureInfo { private fun loadPreference(structures: List<StructureInfo>): StructureInfo {