Merge "Remove references to old Desktop transitions flags" into main (a0f003ff) · Commits · e / os / android_frameworks_base

core/java/android/window/DesktopModeFlags.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -67,17 +67,8 @@ public enum DesktopModeFlags {
		ENABLE_WINDOWING_EDGE_DRAG_RESIZE(Flags::enableWindowingEdgeDragResize, true),
		ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS(
		Flags::enableDesktopWindowingTaskbarRunningApps, true),
		// TODO: b/369763947 - remove this once ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS is ramped up
		ENABLE_DESKTOP_WINDOWING_TRANSITIONS(Flags::enableDesktopWindowingTransitions, false),
		ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS(
		Flags::enableDesktopWindowingEnterTransitions, false),
		ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS(Flags::enableDesktopWindowingExitTransitions, false),
		ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS(
		Flags::enableWindowingTransitionHandlersObservers, false),
		ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS(
		Flags::enableDesktopAppLaunchAlttabTransitions, false),
		ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS(
		Flags::enableDesktopAppLaunchTransitions, false),
		ENABLE_DESKTOP_WINDOWING_PERSISTENCE(Flags::enableDesktopWindowingPersistence, false),
		ENABLE_HANDLE_INPUT_FIX(Flags::enableHandleInputFix, true),
		ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS_BUGFIX(

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.wm.shell.dagger;

		import static android.window.DesktopModeFlags.ENABLE_DESKTOP_SYSTEM_DIALOGS_TRANSITIONS;
		import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS;
		import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS_BUGFIX;
		import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MODALS_POLICY;
		import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TASK_LIMIT;
		@@ -912,9 +911,7 @@ public abstract class WMShellModule {
		Transitions transitions,
		RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer,
		InteractionJankMonitor interactionJankMonitor) {
		return (Flags.enableDesktopWindowingTransitions()
		\|\| ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS.isTrue()
		\|\| ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS_BUGFIX.isTrue())
		return ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS_BUGFIX.isTrue()
		? new SpringDragToDesktopTransitionHandler(
		context, transitions, rootTaskDisplayAreaOrganizer, interactionJankMonitor)
		: new DefaultDragToDesktopTransitionHandler(

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

+2 −9

Original line number	Diff line number	Diff line
		@@ -83,10 +83,7 @@ class DesktopMixedTransitionHandler(

		/** Starts close transition and handles or delegates desktop task close animation. */
		override fun startRemoveTransition(wct: WindowContainerTransaction?): IBinder {
		if (
		!DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS.isTrue &&
		!DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX.isTrue
		) {
		if (!DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX.isTrue) {
		return freeformTaskTransitionHandler.startRemoveTransition(wct)
		}
		requireNotNull(wct)
		@@ -110,7 +107,6 @@ class DesktopMixedTransitionHandler(
		): IBinder {
		if (
		!Flags.enableFullyImmersiveInDesktop() &&
		!DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS.isTrue &&
		!DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX.isTrue
		) {
		return transitions.startTransition(transitionType, wct, /* handler= */ null)
		@@ -259,10 +255,7 @@ class DesktopMixedTransitionHandler(
		minimizeChange?.taskInfo?.taskId,
		immersiveExitChange?.taskInfo?.taskId,
		)
		if (
		DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS.isTrue \|\|
		DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX.isTrue
		) {
		if (DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX.isTrue) {
		// Only apply minimize change reparenting here if we implement the new app launch
		// transitions, otherwise this reparenting is handled in the default handler.
		minimizeChange?.let {

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -2346,10 +2346,7 @@ class DesktopTasksController(
		launchTaskId: Int,
		minimizeTaskId: Int?,
		) {
		if (
		!DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS.isTrue &&
		!DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX.isTrue
		) {
		if (!DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX.isTrue) {
		return
		}
		// TODO b/359523924: pass immersive task here?

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

+10 −41

Original line number	Diff line number	Diff line
		@@ -143,10 +143,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
		}

		@Test
		@DisableFlags(
		Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS,
		Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX,
		)
		@DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX)
		fun startRemoveTransition_callsFreeformTaskTransitionHandler() {
		val wct = WindowContainerTransaction()
		whenever(freeformTaskTransitionHandler.startRemoveTransition(wct)).thenReturn(mock())
		@@ -157,10 +154,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
		}

		@Test
		@EnableFlags(
		Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS,
		Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX,
		)
		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX)
		fun startRemoveTransition_startsCloseTransition() {
		val wct = WindowContainerTransaction()
		whenever(transitions.startTransition(WindowManager.TRANSIT_CLOSE, wct, mixedHandler))
		@@ -200,10 +194,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
		}

		@Test
		@EnableFlags(
		Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS,
		Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX,
		)
		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX)
		fun startAnimation_withClosingDesktopTask_callsCloseTaskHandler() {
		val wct = WindowContainerTransaction()
		val transition = mock<IBinder>()
		@@ -231,10 +222,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
		}

		@Test
		@EnableFlags(
		Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS,
		Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX,
		)
		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX)
		fun startAnimation_withClosingLastDesktopTask_dispatchesTransition() {
		val wct = WindowContainerTransaction()
		val transition = mock<IBinder>()
		@@ -278,7 +266,6 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
		@Test
		@DisableFlags(
		Flags.FLAG_ENABLE_FULLY_IMMERSIVE_IN_DESKTOP,
		Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,
		Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX,
		)
		fun startLaunchTransition_immersiveAndAppLaunchFlagsDisabled_doesNotUseMixedHandler() {
		@@ -316,10 +303,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
		}

		@Test
		@EnableFlags(
		Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,
		Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX,
		)
		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)
		fun startLaunchTransition_desktopAppLaunchEnabled_usesMixedHandler() {
		val wct = WindowContainerTransaction()
		val task = createTask(WINDOWING_MODE_FREEFORM)
		@@ -415,10 +399,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
		}

		@Test
		@EnableFlags(
		Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,
		Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX,
		)
		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)
		fun startAndAnimateLaunchTransition_noMinimizeChange_doesNotReparentMinimizeChange() {
		val wct = WindowContainerTransaction()
		val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
		@@ -444,10 +425,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
		}

		@Test
		@EnableFlags(
		Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,
		Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX,
		)
		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)
		fun startAndAnimateLaunchTransition_withMinimizeChange_reparentsMinimizeChange() {
		val wct = WindowContainerTransaction()
		val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
		@@ -476,10 +454,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
		}

		@Test
		@EnableFlags(
		Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,
		Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX,
		)
		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)
		fun startAnimation_pendingTransition_noLaunchChange_returnsFalse() {
		val wct = WindowContainerTransaction()
		val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
		@@ -569,10 +544,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
		}

		@Test
		@EnableFlags(
		Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,
		Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX,
		)
		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)
		fun addPendingAndAnimateLaunchTransition_noMinimizeChange_doesNotReparentMinimizeChange() {
		val wct = WindowContainerTransaction()
		val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
		@@ -600,10 +572,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
		}

		@Test
		@EnableFlags(
		Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,
		Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX,
		)
		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)
		fun addPendingAndAnimateLaunchTransition_withMinimizeChange_reparentsMinimizeChange() {
		val wct = WindowContainerTransaction()
		val launchingTask = createTask(WINDOWING_MODE_FREEFORM)