Merge "Controls UI - Fix title icon" into rvc-dev am: 5338509b9d am: 77b3c0e4e3 am: 41c90098b8 (d4f28e5b) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -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<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)
		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 {