Merge "Handle close transition for Chrome Manage Windows menu" into main (d056b24d) · Commits · e / os / android_frameworks_base

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

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2610,6 +2610,10 @@ class DesktopTasksController(
	snapEventHandler.removeTaskIfTiled(task.displayId, task.taskId)		snapEventHandler.removeTaskIfTiled(task.displayId, task.taskId)
	}		}

			if (DesktopExperienceFlags.ENABLE_DESKTOP_CLOSE_TASK_ANIMATION_IN_DTC_BUGFIX.isTrue) {
			addPendingCloseTransition(transition)
			}

	taskbarDesktopTaskListener?.onTaskbarCornerRoundingUpdate(		taskbarDesktopTaskListener?.onTaskbarCornerRoundingUpdate(
	doesAnyTaskRequireTaskbarRounding(task.displayId, task.taskId)		doesAnyTaskRequireTaskbarRounding(task.displayId, task.taskId)
	)		)
	@@ -2897,6 +2901,12 @@ class DesktopTasksController(
	)		)
	}		}

			private fun addPendingCloseTransition(transition: IBinder) {
			desktopMixedTransitionHandler.addPendingMixedTransition(
			DesktopMixedTransitionHandler.PendingMixedTransition.Close(transition)
			)
			}

	private fun activateDefaultDeskInDisplay(		private fun activateDefaultDeskInDisplay(
	displayId: Int,		displayId: Int,
	remoteTransition: RemoteTransition? = null,		remoteTransition: RemoteTransition? = null,

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5155,6 +5155,22 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	.assertReorderAt(index = 0, wallpaperToken, toTop = false)		.assertReorderAt(index = 0, wallpaperToken, toTop = false)
	}		}

			@Test
			@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_CLOSE_TASK_ANIMATION_IN_DTC_BUGFIX)
			fun handleRequest_closeTransition_addPendingMixedTransition() {
			val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)
			val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)
			val transition = Binder()

			taskRepository.addTask(DEFAULT_DISPLAY, taskId = 1, isVisible = true)
			controller.handleRequest(transition, createTransition(task2, type = TRANSIT_CLOSE))

			verify(desktopMixedTransitionHandler)
			.addPendingMixedTransition(
			DesktopMixedTransitionHandler.PendingMixedTransition.Close(transition)
			)
			}

	@Test		@Test
	@EnableFlags(		@EnableFlags(
	Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,		Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,