Merge "[Desktop Windowing] Use Change leash for minimize animation CUJ" into main (0b64be3a) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksLimiter.kt

+14 −8

Original line number	Diff line number	Diff line
		@@ -127,15 +127,21 @@ class DesktopTasksLimiter(

		override fun onTransitionStarting(transition: IBinder) {
		val mActiveTaskDetails = activeTransitionTokensAndTasks[transition]
		if (mActiveTaskDetails != null && mActiveTaskDetails.transitionInfo != null) {
		val info = mActiveTaskDetails?.transitionInfo ?: return
		val minimizeChange = getMinimizeChange(info, mActiveTaskDetails.taskId) ?: return
		// Begin minimize window CUJ instrumentation.
		interactionJankMonitor.begin(
		mActiveTaskDetails.transitionInfo?.rootLeash,
		minimizeChange.leash,
		context,
		handler,
		CUJ_DESKTOP_MODE_MINIMIZE_WINDOW,
		)
		}

		private fun getMinimizeChange(info: TransitionInfo, taskId: Int): TransitionInfo.Change? {
		return info.changes.find { change ->
		change.taskInfo?.taskId == taskId && change.mode == TRANSIT_TO_BACK
		}
		}

		override fun onTransitionMerged(merged: IBinder, playing: IBinder) {

+3 −3

Original line number	Diff line number	Diff line
		@@ -551,7 +551,7 @@ class DesktopTasksLimiterTest : ShellTestCase() {
		.getTransitionObserver()
		.onTransitionReady(
		transition,
		TransitionInfoBuilder(TRANSIT_OPEN).build(),
		TransitionInfoBuilder(TRANSIT_OPEN).addChange(TRANSIT_TO_BACK, task).build(),
		StubTransaction() /* startTransaction */,
		StubTransaction(), /* finishTransaction */
		)
		@@ -583,7 +583,7 @@ class DesktopTasksLimiterTest : ShellTestCase() {
		.getTransitionObserver()
		.onTransitionReady(
		transition,
		TransitionInfoBuilder(TRANSIT_OPEN).build(),
		TransitionInfoBuilder(TRANSIT_OPEN).addChange(TRANSIT_TO_BACK, task).build(),
		StubTransaction() /* startTransaction */,
		StubTransaction(), /* finishTransaction */
		)
		@@ -616,7 +616,7 @@ class DesktopTasksLimiterTest : ShellTestCase() {
		.getTransitionObserver()
		.onTransitionReady(
		mergedTransition,
		TransitionInfoBuilder(TRANSIT_OPEN).build(),
		TransitionInfoBuilder(TRANSIT_OPEN).addChange(TRANSIT_TO_BACK, task).build(),
		StubTransaction() /* startTransaction */,
		StubTransaction(), /* finishTransaction */
		)