From aaccdbee8aa2eced98009ec7c5dfa4aa34afc6f2 Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Wed, 4 Mar 2020 08:22:03 -0500 Subject: [PATCH] Controls UI - Fix title icon Remove the hardcoded reference, and retrieve the current selected item Bug: 150705462 Test: manual Change-Id: I8401e61392ab5568e23cd9a253a3c75e863783ba --- .../systemui/controls/ui/ControlsUiControllerImpl.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt index 71fc01717baa5..c7157da26ea35 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt @@ -293,8 +293,13 @@ class ControlsUiControllerImpl @Inject constructor ( * for this dialog. Use a textView with the ListPopupWindow to achieve * a similar effect */ + val item = adapter.findSelectionItem(selectedStructure) ?: adapter.getItem(0) parent.requireViewById(R.id.app_or_structure_spinner).apply { - setText((adapter.findSelectionItem(selectedStructure) ?: adapter.getItem(0)).getTitle()) + setText(item.getTitle()) + } + parent.requireViewById(R.id.app_icon).apply { + setContentDescription(item.getTitle()) + setImageDrawable(item.icon) } val anchor = parent.requireViewById(R.id.controls_header) anchor.setOnClickListener(object : View.OnClickListener { @@ -330,11 +335,6 @@ class ControlsUiControllerImpl @Inject constructor ( } } }) - - parent.requireViewById(R.id.app_icon).apply { - setContentDescription("My Home") - setImageDrawable(items[0].icon) - } } private fun loadPreference(structures: List): StructureInfo {