Merge "Update the taskbar corner radius when minimizing a task" into main (b8a11f73) · Commits · e / os / android_frameworks_base

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -886,6 +886,9 @@ class DesktopTasksController(
		exitResult.asExit()?.runOnTransitionStart?.invoke(transition)
		desktopExitRunnable?.invoke(transition)
		}
		taskbarDesktopTaskListener?.onTaskbarCornerRoundingUpdate(
		doesAnyTaskRequireTaskbarRounding(displayId, taskId)
		)
		}

		/** Move a task with given `taskId` to fullscreen */

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

+31 −0

Original line number	Diff line number	Diff line
		@@ -3539,6 +3539,19 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
		verify(freeformTaskTransitionStarter, never()).startPipTransition(any())
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PIP)
		fun onPipTaskMinimize_autoEnterEnabled_sendsTaskbarRoundingUpdate() {
		val task = setUpPipTask(autoEnterEnabled = true)
		val handler = mock(TransitionHandler::class.java)
		whenever(transitions.dispatchRequest(any(), any(), anyOrNull()))
		.thenReturn(android.util.Pair(handler, WindowContainerTransaction()))

		controller.minimizeTask(task, MinimizeReason.MINIMIZE_BUTTON)

		verify(taskbarDesktopTaskListener).onTaskbarCornerRoundingUpdate(anyBoolean())
		}

		@Test
		@EnableFlags(
		Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER,
		@@ -3840,6 +3853,24 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
		verify(snapEventHandler).removeTaskIfTiled(eq(DEFAULT_DISPLAY), eq(task.taskId))
		}

		@Test
		fun onDesktopWindowMinimize_sendsTaskbarRoundingUpdate() {
		val task = setUpFreeformTask(displayId = DEFAULT_DISPLAY)
		val transition = Binder()
		whenever(
		freeformTaskTransitionStarter.startMinimizedModeTransition(
		any(),
		anyInt(),
		anyBoolean(),
		)
		)
		.thenReturn(transition)

		controller.minimizeTask(task, MinimizeReason.MINIMIZE_BUTTON)

		verify(taskbarDesktopTaskListener).onTaskbarCornerRoundingUpdate(anyBoolean())
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)
		fun handleRequest_fullscreenTask_switchToDesktop_movesTaskToDesk() {