Merge "Revert^2 "If wallpaper activity already exists, reorder it"" into main (b1843033) · Commits · e / os / android_frameworks_base

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

+9 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1659,11 +1659,16 @@ class DesktopTasksController(
	private fun addWallpaperActivity(displayId: Int, wct: WindowContainerTransaction) {		private fun addWallpaperActivity(displayId: Int, wct: WindowContainerTransaction) {
	logV("addWallpaperActivity")		logV("addWallpaperActivity")
	if (ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER.isTrue()) {		if (ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER.isTrue()) {

			// If the wallpaper activity for this display already exists, let's reorder it to top.
			val wallpaperActivityToken = desktopWallpaperActivityTokenProvider.getToken(displayId)
			if (wallpaperActivityToken != null) {
			wct.reorder(wallpaperActivityToken, /* onTop= */ true)
			return
			}

	val intent = Intent(context, DesktopWallpaperActivity::class.java)		val intent = Intent(context, DesktopWallpaperActivity::class.java)
	if (		if (Flags.enablePerDisplayDesktopWallpaperActivity()) {
	desktopWallpaperActivityTokenProvider.getToken(displayId) == null &&
	Flags.enablePerDisplayDesktopWallpaperActivity()
	) {
	intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
	intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK)		intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
	}		}

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

+50 −10

Original line number	Original line	Diff line number	Diff line
	@@ -546,6 +546,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)
	@DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)		@DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)
	fun showDesktopApps_allAppsInvisible_bringsToFront_desktopWallpaperEnabled() {		fun showDesktopApps_allAppsInvisible_bringsToFront_desktopWallpaperEnabled() {
			whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)
	val task1 = setUpFreeformTask()		val task1 = setUpFreeformTask()
	val task2 = setUpFreeformTask()		val task2 = setUpFreeformTask()
	markTaskHidden(task1)		markTaskHidden(task1)
	@@ -580,7 +581,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	val wct =		val wct =
	getLatestWct(type = TRANSIT_TO_FRONT, handlerClass = OneShotRemoteHandler::class.java)		getLatestWct(type = TRANSIT_TO_FRONT, handlerClass = OneShotRemoteHandler::class.java)
	// Wallpaper is moved to front.		// Wallpaper is moved to front.
	wct.assertPendingIntentAt(index = 0, desktopWallpaperIntent)		wct.assertReorderAt(index = 0, wallpaperToken)
	// Desk is activated.		// Desk is activated.
	verify(desksOrganizer).activateDesk(wct, deskId)		verify(desksOrganizer).activateDesk(wct, deskId)
	}		}
	@@ -782,6 +783,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)
	@DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)		@DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)
	fun showDesktopApps_appsAlreadyVisible_bringsToFront_desktopWallpaperEnabled() {		fun showDesktopApps_appsAlreadyVisible_bringsToFront_desktopWallpaperEnabled() {
			whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)
	val task1 = setUpFreeformTask()		val task1 = setUpFreeformTask()
	val task2 = setUpFreeformTask()		val task2 = setUpFreeformTask()
	markTaskVisible(task1)		markTaskVisible(task1)
	@@ -824,7 +826,8 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	@Test		@Test
	@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)
	@DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)		@DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)
	fun showDesktopApps_someAppsInvisible_reordersAll_desktopWallpaperEnabled() {		fun showDesktopApps_someAppsInvisible_desktopWallpaperEnabled_reordersOnlyFreeformTasks() {
			whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)
	val task1 = setUpFreeformTask()		val task1 = setUpFreeformTask()
	val task2 = setUpFreeformTask()		val task2 = setUpFreeformTask()
	markTaskHidden(task1)		markTaskHidden(task1)
	@@ -841,6 +844,24 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	wct.assertReorderAt(index = 2, task2)		wct.assertReorderAt(index = 2, task2)
	}		}

			@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)
			fun showDesktopApps_someAppsInvisible_desktopWallpaperEnabled_reordersAll() {
			val task1 = setUpFreeformTask()
			val task2 = setUpFreeformTask()
			markTaskHidden(task1)
			markTaskVisible(task2)

			controller.showDesktopApps(DEFAULT_DISPLAY, RemoteTransition(TestRemoteTransition()))

			val wct =
			getLatestWct(type = TRANSIT_TO_FRONT, handlerClass = OneShotRemoteHandler::class.java)
			assertThat(wct.hierarchyOps).hasSize(3)
			// Expect order to be from bottom: wallpaper intent, task1, task2
			wct.assertReorderAt(index = 0, wallpaperToken)
			wct.assertReorderAt(index = 1, task1)
			wct.assertReorderAt(index = 2, task2)
			}

	@Test		@Test
	@DisableFlags(		@DisableFlags(
	Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,		Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,
	@@ -859,9 +880,9 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()

	@Test		@Test
	@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)
	fun showDesktopApps_noActiveTasks_addDesktopWallpaper_desktopWallpaperEnabled() {		fun showDesktopApps_noActiveTasks_desktopWallpaperEnabled_addsDesktopWallpaper() {
	whenever(transitions.startTransition(eq(TRANSIT_TO_FRONT), any(), anyOrNull()))		whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)
	.thenReturn(Binder())
	controller.showDesktopApps(DEFAULT_DISPLAY, RemoteTransition(TestRemoteTransition()))		controller.showDesktopApps(DEFAULT_DISPLAY, RemoteTransition(TestRemoteTransition()))

	val wct =		val wct =
	@@ -870,10 +891,18 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	}		}

	@Test		@Test
	@DisableFlags(		@DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)
	Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)
	Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,		fun showDesktopApps_noActiveTasks_desktopWallpaperEnabled_reordersDesktopWallpaper() {
	)		controller.showDesktopApps(DEFAULT_DISPLAY, RemoteTransition(TestRemoteTransition()))

			val wct =
			getLatestWct(type = TRANSIT_TO_FRONT, handlerClass = OneShotRemoteHandler::class.java)
			wct.assertReorderAt(index = 0, wallpaperToken)
			}

			@Test
			@DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)
	fun showDesktopApps_twoDisplays_bringsToFrontOnlyOneDisplay_desktopWallpaperDisabled() {		fun showDesktopApps_twoDisplays_bringsToFrontOnlyOneDisplay_desktopWallpaperDisabled() {
	taskRepository.addDesk(displayId = SECOND_DISPLAY, deskId = SECOND_DISPLAY)		taskRepository.addDesk(displayId = SECOND_DISPLAY, deskId = SECOND_DISPLAY)
	val homeTaskDefaultDisplay = setUpHomeTask(DEFAULT_DISPLAY)		val homeTaskDefaultDisplay = setUpHomeTask(DEFAULT_DISPLAY)
	@@ -898,6 +927,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	fun showDesktopApps_twoDisplays_bringsToFrontOnlyOneDisplay_desktopWallpaperEnabled() {		fun showDesktopApps_twoDisplays_bringsToFrontOnlyOneDisplay_desktopWallpaperEnabled() {
	whenever(transitions.startTransition(eq(TRANSIT_TO_FRONT), any(), anyOrNull()))		whenever(transitions.startTransition(eq(TRANSIT_TO_FRONT), any(), anyOrNull()))
	.thenReturn(Binder())		.thenReturn(Binder())
			whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)
	taskRepository.addDesk(displayId = SECOND_DISPLAY, deskId = SECOND_DISPLAY)		taskRepository.addDesk(displayId = SECOND_DISPLAY, deskId = SECOND_DISPLAY)
	val homeTaskDefaultDisplay = setUpHomeTask(DEFAULT_DISPLAY)		val homeTaskDefaultDisplay = setUpHomeTask(DEFAULT_DISPLAY)
	val taskDefaultDisplay = setUpFreeformTask(DEFAULT_DISPLAY)		val taskDefaultDisplay = setUpFreeformTask(DEFAULT_DISPLAY)
	@@ -990,6 +1020,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	/** TODO: b/362720497 - add multi-desk version when minimization is implemented. */		/** TODO: b/362720497 - add multi-desk version when minimization is implemented. */
	@DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)		@DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)
	fun showDesktopApps_desktopWallpaperEnabled_dontReorderMinimizedTask() {		fun showDesktopApps_desktopWallpaperEnabled_dontReorderMinimizedTask() {
			whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)
	val homeTask = setUpHomeTask()		val homeTask = setUpHomeTask()
	val freeformTask = setUpFreeformTask()		val freeformTask = setUpFreeformTask()
	val minimizedTask = setUpFreeformTask()		val minimizedTask = setUpFreeformTask()
	@@ -1568,6 +1599,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	@Test		@Test
	@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)
	fun moveTaskToDesktop_desktopWallpaperEnabled_nonRunningTask_launchesInFreeform() {		fun moveTaskToDesktop_desktopWallpaperEnabled_nonRunningTask_launchesInFreeform() {
			whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)
	val task = createTaskInfo(1)		val task = createTaskInfo(1)
	whenever(shellTaskOrganizer.getRunningTaskInfo(anyInt())).thenReturn(null)		whenever(shellTaskOrganizer.getRunningTaskInfo(anyInt())).thenReturn(null)
	whenever(recentTasksController.findTaskInBackground(anyInt())).thenReturn(task)		whenever(recentTasksController.findTaskInBackground(anyInt())).thenReturn(task)
	@@ -1801,6 +1833,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)
	@DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)		@DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)
	fun moveRunningTaskToDesktop_otherFreeformTasksBroughtToFront_desktopWallpaperEnabled() {		fun moveRunningTaskToDesktop_otherFreeformTasksBroughtToFront_desktopWallpaperEnabled() {
			whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)
	val freeformTask = setUpFreeformTask()		val freeformTask = setUpFreeformTask()
	val fullscreenTask = setUpFullscreenTask()		val fullscreenTask = setUpFullscreenTask()
	markTaskHidden(freeformTask)		markTaskHidden(freeformTask)
	@@ -1827,6 +1860,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	@EnableFlags(		@EnableFlags(
	Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,		Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,
	Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,		Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,
			Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER,
	)		)
	fun moveRunningTaskToDesktop_desktopWallpaperEnabled_multiDesksEnabled() {		fun moveRunningTaskToDesktop_desktopWallpaperEnabled_multiDesksEnabled() {
	val freeformTask = setUpFreeformTask()		val freeformTask = setUpFreeformTask()
	@@ -1839,7 +1873,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	)		)

	val wct = getLatestEnterDesktopWct()		val wct = getLatestEnterDesktopWct()
	wct.assertPendingIntentAt(index = 0, desktopWallpaperIntent)		wct.assertReorderAt(index = 0, wallpaperToken)
	verify(desksOrganizer).moveTaskToDesk(wct, deskId = 0, fullscreenTask)		verify(desksOrganizer).moveTaskToDesk(wct, deskId = 0, fullscreenTask)
	verify(desksOrganizer).activateDesk(wct, deskId = 0)		verify(desksOrganizer).activateDesk(wct, deskId = 0)
	verify(desktopModeEnterExitTransitionListener)		verify(desktopModeEnterExitTransitionListener)
	@@ -1966,6 +2000,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)
	@DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)		@DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)
	fun moveRunningTaskToDesktop_desktopWallpaperEnabled_bringsTasksOverLimit_dontShowBackTask() {		fun moveRunningTaskToDesktop_desktopWallpaperEnabled_bringsTasksOverLimit_dontShowBackTask() {
			whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)
	val freeformTasks = (1..MAX_TASK_LIMIT).map { _ -> setUpFreeformTask() }		val freeformTasks = (1..MAX_TASK_LIMIT).map { _ -> setUpFreeformTask() }
	val newTask = setUpFullscreenTask()		val newTask = setUpFullscreenTask()
	val homeTask = setUpHomeTask()		val homeTask = setUpHomeTask()
	@@ -2986,6 +3021,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	@Test		@Test
	@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)
	fun handleRequest_fullscreenTask_noTasks_enforceDesktop_freeformDisplay_returnFreeformWCT() {		fun handleRequest_fullscreenTask_noTasks_enforceDesktop_freeformDisplay_returnFreeformWCT() {
			whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)
	whenever(DesktopModeStatus.enterDesktopByDefaultOnFreeformDisplay(context)).thenReturn(true)		whenever(DesktopModeStatus.enterDesktopByDefaultOnFreeformDisplay(context)).thenReturn(true)
	val tda = rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(DEFAULT_DISPLAY)!!		val tda = rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(DEFAULT_DISPLAY)!!
	tda.configuration.windowConfiguration.windowingMode = WINDOWING_MODE_FREEFORM		tda.configuration.windowConfiguration.windowingMode = WINDOWING_MODE_FREEFORM
	@@ -3117,6 +3153,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	@Test		@Test
	@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)
	fun handleRequest_freeformTask_desktopWallpaperEnabled_freeformNotVisible_reorderedToTop() {		fun handleRequest_freeformTask_desktopWallpaperEnabled_freeformNotVisible_reorderedToTop() {
			whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)
	val freeformTask1 = setUpFreeformTask()		val freeformTask1 = setUpFreeformTask()
	val freeformTask2 = createFreeformTask()		val freeformTask2 = createFreeformTask()

	@@ -3151,7 +3188,9 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	@Test		@Test
	@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)
	fun handleRequest_freeformTask_desktopWallpaperEnabled_noOtherTasks_reorderedToTop() {		fun handleRequest_freeformTask_desktopWallpaperEnabled_noOtherTasks_reorderedToTop() {
			whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)
	val task = createFreeformTask()		val task = createFreeformTask()

	val result = controller.handleRequest(Binder(), createTransition(task))		val result = controller.handleRequest(Binder(), createTransition(task))

	assertNotNull(result, "Should handle request")		assertNotNull(result, "Should handle request")
	@@ -3179,6 +3218,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
	@Test		@Test
	@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)
	fun handleRequest_freeformTask_dskWallpaperEnabled_freeformOnOtherDisplayOnly_reorderedToTop() {		fun handleRequest_freeformTask_dskWallpaperEnabled_freeformOnOtherDisplayOnly_reorderedToTop() {
			whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)
	val taskDefaultDisplay = createFreeformTask(displayId = DEFAULT_DISPLAY)		val taskDefaultDisplay = createFreeformTask(displayId = DEFAULT_DISPLAY)
	// Second display task		// Second display task
	createFreeformTask(displayId = SECOND_DISPLAY)		createFreeformTask(displayId = SECOND_DISPLAY)