Merge "Remove OnPreDrawListener when detached from window" (31b3d88a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/util/animation/TransitionLayout.kt

+14 −1

Original line number	Original line	Diff line number	Diff line
	@@ -46,6 +46,7 @@ class TransitionLayout @JvmOverloads constructor(
	private var measureAsConstraint: Boolean = false		private var measureAsConstraint: Boolean = false
	private var currentState: TransitionViewState = TransitionViewState()		private var currentState: TransitionViewState = TransitionViewState()
	private var updateScheduled = false		private var updateScheduled = false
			private var isPreDrawApplicatorRegistered = false

	private var desiredMeasureWidth = 0		private var desiredMeasureWidth = 0
	private var desiredMeasureHeight = 0		private var desiredMeasureHeight = 0
	@@ -74,6 +75,7 @@ class TransitionLayout @JvmOverloads constructor(
	override fun onPreDraw(): Boolean {		override fun onPreDraw(): Boolean {
	updateScheduled = false		updateScheduled = false
	viewTreeObserver.removeOnPreDrawListener(this)		viewTreeObserver.removeOnPreDrawListener(this)
			isPreDrawApplicatorRegistered = false
	applyCurrentState()		applyCurrentState()
	return true		return true
	}		}
	@@ -94,6 +96,14 @@ class TransitionLayout @JvmOverloads constructor(
	}		}
	}		}

			override fun onDetachedFromWindow() {
			super.onDetachedFromWindow()
			if (isPreDrawApplicatorRegistered) {
			viewTreeObserver.removeOnPreDrawListener(preDrawApplicator)
			isPreDrawApplicatorRegistered = false
			}
			}

	/**		/**
	* Apply the current state to the view and its widgets		* Apply the current state to the view and its widgets
	*/		*/
	@@ -158,7 +168,10 @@ class TransitionLayout @JvmOverloads constructor(
	private fun applyCurrentStateOnPredraw() {		private fun applyCurrentStateOnPredraw() {
	if (!updateScheduled) {		if (!updateScheduled) {
	updateScheduled = true		updateScheduled = true
			if (!isPreDrawApplicatorRegistered) {
	viewTreeObserver.addOnPreDrawListener(preDrawApplicator)		viewTreeObserver.addOnPreDrawListener(preDrawApplicator)
			isPreDrawApplicatorRegistered = true
			}
	}		}
	}		}