Merge "Controls UI - Fix crash on missing control" into rvc-dev am: 2c5cc48d3f am: 59169701a5 (715d1d6e) · Commits · e / os / android_frameworks_base

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

+23 −15

Original line number	Original line	Diff line number	Diff line
	@@ -167,11 +167,17 @@ class ControlsUiControllerImpl @Inject constructor (
	private fun reload(parent: ViewGroup) {		private fun reload(parent: ViewGroup) {
	if (hidden) return		if (hidden) return

			controlsListingController.get().removeCallback(listingCallback)
			controlsController.get().unsubscribe()

	val fadeAnim = ObjectAnimator.ofFloat(parent, "alpha", 1.0f, 0.0f)		val fadeAnim = ObjectAnimator.ofFloat(parent, "alpha", 1.0f, 0.0f)
	fadeAnim.setInterpolator(AccelerateInterpolator(1.0f))		fadeAnim.setInterpolator(AccelerateInterpolator(1.0f))
	fadeAnim.setDuration(FADE_IN_MILLIS)		fadeAnim.setDuration(FADE_IN_MILLIS)
	fadeAnim.addListener(object : AnimatorListenerAdapter() {		fadeAnim.addListener(object : AnimatorListenerAdapter() {
	override fun onAnimationEnd(animation: Animator) {		override fun onAnimationEnd(animation: Animator) {
			controlViewsById.clear()
			controlsById.clear()

	show(parent, dismissGlobalActions)		show(parent, dismissGlobalActions)
	val showAnim = ObjectAnimator.ofFloat(parent, "alpha", 0.0f, 1.0f)		val showAnim = ObjectAnimator.ofFloat(parent, "alpha", 0.0f, 1.0f)
	showAnim.setInterpolator(DecelerateInterpolator(1.0f))		showAnim.setInterpolator(DecelerateInterpolator(1.0f))
	@@ -445,6 +451,8 @@ class ControlsUiControllerImpl @Inject constructor (
	val listView = parent.requireViewById(R.id.global_actions_controls_list) as ViewGroup		val listView = parent.requireViewById(R.id.global_actions_controls_list) as ViewGroup
	var lastRow: ViewGroup = createRow(inflater, listView)		var lastRow: ViewGroup = createRow(inflater, listView)
	selectedStructure.controls.forEach {		selectedStructure.controls.forEach {
			val key = ControlKey(selectedStructure.componentName, it.controlId)
			controlsById.get(key)?.let {
	if (lastRow.getChildCount() == maxColumns) {		if (lastRow.getChildCount() == maxColumns) {
	lastRow = createRow(inflater, listView)		lastRow = createRow(inflater, listView)
	}		}
	@@ -457,10 +465,10 @@ class ControlsUiControllerImpl @Inject constructor (
	uiExecutor,		uiExecutor,
	bgExecutor		bgExecutor
	)		)
	val key = ControlKey(selectedStructure.componentName, it.controlId)		cvh.bindData(it)
	cvh.bindData(controlsById.getValue(key))
	controlViewsById.put(key, cvh)		controlViewsById.put(key, cvh)
	}		}
			}

	// add spacers if necessary to keep control size consistent		// add spacers if necessary to keep control size consistent
	val mod = selectedStructure.controls.size % maxColumns		val mod = selectedStructure.controls.size % maxColumns
	@@ -525,7 +533,6 @@ class ControlsUiControllerImpl @Inject constructor (
	if (newSelection != selectedStructure) {		if (newSelection != selectedStructure) {
	selectedStructure = newSelection		selectedStructure = newSelection
	updatePreferences(selectedStructure)		updatePreferences(selectedStructure)
	controlsListingController.get().removeCallback(listingCallback)
	reload(parent)		reload(parent)
	}		}
	}		}
	@@ -546,6 +553,7 @@ class ControlsUiControllerImpl @Inject constructor (
	parent.removeAllViews()		parent.removeAllViews()
	controlsById.clear()		controlsById.clear()
	controlViewsById.clear()		controlViewsById.clear()

	controlsListingController.get().removeCallback(listingCallback)		controlsListingController.get().removeCallback(listingCallback)

	RenderInfo.clearCache()		RenderInfo.clearCache()