Merge "Move exit-desktop on window-close CUJ to Launcher" into main (b6fcc57d) · Commits · e / os / android_frameworks_base

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

+0 −14

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import android.window.TransitionInfo.Change
		import android.window.TransitionRequestInfo
		import android.window.WindowContainerTransaction
		import androidx.annotation.VisibleForTesting
		import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE
		import com.android.internal.jank.InteractionJankMonitor
		import com.android.internal.protolog.ProtoLog
		import com.android.window.flags.Flags
		@@ -204,7 +203,6 @@ class DesktopMixedTransitionHandler(
		return dispatchCloseLastDesktopTaskAnimation(
		transition,
		info,
		closeChange,
		startTransaction,
		finishTransaction,
		finishCallback,
		@@ -345,18 +343,10 @@ class DesktopMixedTransitionHandler(
		private fun dispatchCloseLastDesktopTaskAnimation(
		transition: IBinder,
		info: TransitionInfo,
		change: TransitionInfo.Change,
		startTransaction: SurfaceControl.Transaction,
		finishTransaction: SurfaceControl.Transaction,
		finishCallback: TransitionFinishCallback,
		): Boolean {
		// Starting the jank trace if closing the last window in desktop mode.
		interactionJankMonitor.begin(
		change.leash,
		context,
		handler,
		CUJ_DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE,
		)
		// Dispatch the last desktop task closing animation.
		return dispatchToLeftoverHandler(
		transition = transition,
		@@ -364,10 +354,6 @@ class DesktopMixedTransitionHandler(
		startTransaction = startTransaction,
		finishTransaction = finishTransaction,
		finishCallback = finishCallback,
		doOnFinishCallback = {
		// Finish the jank trace when closing the last window in desktop mode.
		interactionJankMonitor.end(CUJ_DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE)
		},
		)
		}

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopMixedTransitionHandlerTest.kt

+0 −8

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import android.window.TransitionInfo
		import android.window.WindowContainerToken
		import android.window.WindowContainerTransaction
		import androidx.test.filters.SmallTest
		import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE
		import com.android.internal.jank.InteractionJankMonitor
		import com.android.window.flags.Flags
		import com.android.wm.shell.RootTaskDisplayAreaOrganizer
		@@ -254,13 +253,6 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
		any(),
		eq(mixedHandler),
		)
		verify(interactionJankMonitor)
		.begin(
		closingTaskLeash,
		context,
		mockHandler,
		CUJ_DESKTOP_MODE_EXIT_MODE_ON_LAST_WINDOW_CLOSE,
		)
		}

		@Test