Merge changes I40669d64,Ie342cbed into main (926f9232) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/common/HomeIntentProvider.kt

+10 −0

Original line number	Diff line number	Diff line
		@@ -23,9 +23,12 @@ import android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN
		import android.content.Context
		import android.content.Intent
		import android.os.UserHandle
		import android.view.Display
		import android.view.Display.DEFAULT_DISPLAY
		import android.window.DesktopExperienceFlags.ENABLE_PER_DISPLAY_DESKTOP_WALLPAPER_ACTIVITY
		import android.window.WindowContainerTransaction
		import com.android.internal.protolog.ProtoLog
		import com.android.wm.shell.protolog.ShellProtoLogGroup

		/ Creates home intent /
		class HomeIntentProvider(
		@@ -34,6 +37,13 @@ class HomeIntentProvider(
		fun addLaunchHomePendingIntent(
		wct: WindowContainerTransaction, displayId: Int, userId: Int? = null
		) {
		if (displayId == Display.INVALID_DISPLAY) {
		ProtoLog.w(
		ShellProtoLogGroup.WM_SHELL,
		"HomeIntentProvider: attempted to add launch home intent for invalid display",
		)
		return
		}
		val userHandle =
		if (userId != null) UserHandle.of(userId) else UserHandle.of(ActivityManager.getCurrentUser())

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

+79 −18

Original line number	Diff line number	Diff line
		@@ -2001,6 +2001,12 @@ class DesktopTasksController(
		transitionSource: DesktopModeTransitionSource,
		remoteTransition: RemoteTransition? = null,
		) {
		logV(
		"moveToFullscreen taskId=%d transitionSource=%s remoteTransition=%s",
		taskId,
		transitionSource,
		remoteTransition,
		)
		val taskInfo: TaskInfo? =
		shellTaskOrganizer.getRunningTaskInfo(taskId)
		?: if (enableAltTabKqsFlatenning.isTrue) {
		@@ -2058,14 +2064,21 @@ class DesktopTasksController(
		transitionSource: DesktopModeTransitionSource,
		remoteTransition: RemoteTransition? = null,
		) {
		logV("moveToFullscreenWithAnimation taskId=%d", task.taskId)
		val displayId =
		when {
		// May be invalid when the task info of a recent (non-running task).
		task.displayId != INVALID_DISPLAY -> task.displayId
		focusTransitionObserver.globallyFocusedDisplayId != INVALID_DISPLAY ->
		focusTransitionObserver.globallyFocusedDisplayId
		else -> DEFAULT_DISPLAY
		}
		logV(
		"moveToFullscreenWithAnimation taskId=%d displayId=%d source=%s remoteTransition=%s",
		task.taskId,
		displayId,
		transitionSource,
		remoteTransition,
		)
		val wct = WindowContainerTransaction()

		// When a task is background, update wct to start task.
		@@ -2074,6 +2087,10 @@ class DesktopTasksController(
		shellTaskOrganizer.getRunningTaskInfo(task.taskId) == null &&
		task is RecentTaskInfo
		) {
		logV(
		"moveToFullscreenWithAnimation taskId=%d is in background, adding start WCT",
		task.taskId,
		)
		wct.startTask(
		task.taskId,
		// TODO(b/400817258): Use ActivityOptions Utils when available.
		@@ -3252,6 +3269,7 @@ class DesktopTasksController(
		displayId: Int,
		userId: Int,
		) {
		logV("addLaunchHomePendingIntent displayId=%d userId=%d", displayId, userId)
		homeIntentProvider.addLaunchHomePendingIntent(wct, displayId, userId)
		}

		@@ -3410,6 +3428,20 @@ class DesktopTasksController(
		skipUpdatingExitDesktopListener: Boolean = false,
		exitReason: ExitReason,
		): RunOnTransitStart? {
		logV(
		"performDesktopExitCleanUp deskId=%d displayId=%d userId=%d willExitDesktop=%b " +
		"removingLastTaskId=%d shouldEndUpAtHome=%b skipWallpaperAndHomeOrdering=%b " +
		"skipUpdatingExitDesktopListener=%b exitReason=%s",
		deskId,
		displayId,
		userId,
		willExitDesktop,
		removingLastTaskId,
		shouldEndUpAtHome,
		skipWallpaperAndHomeOrdering,
		skipUpdatingExitDesktopListener,
		exitReason,
		)
		if (!willExitDesktop) return null
		if (
		!skipUpdatingExitDesktopListener &&
		@@ -4813,14 +4845,36 @@ class DesktopTasksController(
		return bounds
		}

		/** Applies the changes needed to enter fullscreen and clean up the desktop if needed. */
		/**
		* Applies the changes needed to enter fullscreen and clean up the desktop if needed.
		*
		* @param destinationDisplayId the destination display id for the task, which may be different
		* from the task info's displayId when the task is also being moved across displays or when
		* the task is a recents (non-running) task that was previously in [destinationDisplayId] but
		* its info reports INVALID_DISPLAY.
		*/
		fun addMoveToFullscreenChanges(
		wct: WindowContainerTransaction,
		taskInfo: TaskInfo,
		willExitDesktop: Boolean,
		displayId: Int = taskInfo.displayId,
		destinationDisplayId: Int = taskInfo.displayId,
		): RunOnTransitStart? {
		val tdaInfo = rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(displayId)!!
		val sourceDisplayId =
		if (taskInfo.displayId != INVALID_DISPLAY) {
		taskInfo.displayId
		} else {
		// This is possible when the task is a recent (non-running) task.
		destinationDisplayId
		}
		logV(
		"addMoveToFullscreenChanges taskId=%d sourceDisplayId=%d destinationDisplayId=%d " +
		"willExitDesktop=%b",
		taskInfo.taskId,
		sourceDisplayId,
		destinationDisplayId,
		willExitDesktop,
		)
		val tdaInfo = rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(destinationDisplayId)!!
		val tdaWindowingMode = tdaInfo.configuration.windowConfiguration.windowingMode
		val targetWindowingMode =
		if (tdaWindowingMode == WINDOWING_MODE_FULLSCREEN) {
		@@ -4841,7 +4895,7 @@ class DesktopTasksController(
		}
		if (
		DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue \|\|
		taskInfo.displayId != displayId
		taskInfo.displayId != destinationDisplayId
		) {
		wct.reparent(taskInfo.token, tdaInfo.token, /* onTop= */ true)
		} else if (enableAltTabKqsFlatenning.isTrue) {
		@@ -4851,30 +4905,37 @@ class DesktopTasksController(
		}
		val userId = taskInfo.userId
		val repository = userRepositories.getProfile(userId)
		val deskId =
		val sourceDeskId =
		// If the task moving to fullscreen was in a desk, then that's the desk to deactivate.
		repository.getDeskIdForTask(taskInfo.taskId)
		?: if (enableAltTabKqsFlatenning.isTrue) {
		repository.getActiveDeskId(displayId)
		// The task we're moving to might not be in a desk (for example, we might be
		// refocusing an already fullscreen task with Alt+Tab), so check if there's a
		// desk active and deactivate that one.
		repository.getActiveDeskId(destinationDisplayId)
		} else {
		null
		}
		if (willExitDesktop) {
		val isLastTask =
		deskId?.let { repository.isOnlyTaskInDesk(taskInfo.taskId, it) } ?: false
		return performDesktopExitCleanUp(
		wct = wct,
		deskId = deskId,
		displayId =
		if (
		val cleanupDisplayId =
		// A desk is getting deactivated, so use that desk's display id.
		sourceDeskId?.let { repository.getDisplayForDesk(it) }
		?: if (
		DesktopExperienceFlags.MOVE_TO_NEXT_DISPLAY_SHORTCUT_WITH_PROJECTED_MODE
		.isTrue
		) {
		// Use the source display ID for clean up when the bug fix flag is enabled.
		taskInfo.displayId
		sourceDisplayId
		} else {
		// Before the bug fix, display move is not considered.
		displayId
		},
		destinationDisplayId
		}
		val isLastTask =
		sourceDeskId?.let { repository.isOnlyTaskInDesk(taskInfo.taskId, it) } ?: false
		return performDesktopExitCleanUp(
		wct = wct,
		deskId = sourceDeskId,
		displayId = cleanupDisplayId,
		userId = userId,
		willExitDesktop = true,
		removingLastTaskId = if (isLastTask) taskInfo.taskId else null,
		@@ -4884,7 +4945,7 @@ class DesktopTasksController(
		.isTrue
		) {
		// If the last task is moved from the display, it should go to home.
		displayId != taskInfo.displayId
		destinationDisplayId != taskInfo.displayId
		} else {
		// Before the bug fix, display move is not considered.
		false

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

+51 −2

Original line number	Diff line number	Diff line
		@@ -3072,6 +3072,48 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
		verifyExitDesktopWCTNotExecuted()
		}

		@Test
		@EnableFlags(
		Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,
		com.android.launcher3.Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING,
		FLAG_MOVE_TO_NEXT_DISPLAY_SHORTCUT_WITH_PROJECTED_MODE,
		)
		fun moveToFullscreen_fullscreenNonRunningTask_deskActive_cleansUpSourceDisplay() {
		whenever(focusTransitionObserver.globallyFocusedDisplayId).thenReturn(SECOND_DISPLAY)
		taskRepository.addDesk(displayId = SECOND_DISPLAY, deskId = 9)
		taskRepository.setActiveDesk(displayId = SECOND_DISPLAY, deskId = 9)
		val task = setUpFullscreenTask(displayId = INVALID_TASK_ID, background = true)

		controller.moveToFullscreen(task.taskId, transitionSource = UNKNOWN)

		val wct = getLatestExitDesktopWct()
		// Verify that cleanup (e.g. resetting the launcher) is performed on the source display
		// where the task originated from.
		wct.assertPendingIntent(launchHomeIntent(SECOND_DISPLAY))
		wct.assertPendingIntentActivityOptionsLaunchDisplayId(SECOND_DISPLAY)
		}

		@Test
		@EnableFlags(
		Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,
		com.android.launcher3.Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING,
		FLAG_MOVE_TO_NEXT_DISPLAY_SHORTCUT_WITH_PROJECTED_MODE,
		)
		fun moveToFullscreen_fullscreenNonRunningTask_noDeskActive_cleansUpSourceDisplay() {
		whenever(focusTransitionObserver.globallyFocusedDisplayId).thenReturn(SECOND_DISPLAY)
		taskRepository.addDesk(displayId = SECOND_DISPLAY, deskId = 9)
		taskRepository.setDeskInactive(deskId = 9)
		val task = setUpFullscreenTask(displayId = INVALID_TASK_ID, background = true)

		controller.moveToFullscreen(task.taskId, transitionSource = UNKNOWN)

		val wct = getLatestExitDesktopWct()
		// Verify that cleanup (e.g. resetting the launcher) is performed on the source display
		// where the task originated from.
		wct.assertPendingIntent(launchHomeIntent(SECOND_DISPLAY))
		wct.assertPendingIntentActivityOptionsLaunchDisplayId(SECOND_DISPLAY)
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)
		fun moveToFullscreen_secondDisplayTaskHasFreeform_secondDisplayNotAffected() {
		@@ -12631,6 +12673,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
		enableSystemFullscreenOverride: Boolean = false,
		aspectRatioOverrideApplied: Boolean = false,
		visible: Boolean = true,
		background: Boolean = false,
		): RunningTaskInfo {
		val task = createFullscreenTask(displayId)
		val activityInfo = ActivityInfo()
		@@ -12681,8 +12724,14 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
		}
		isVisible = visible
		}
		if (background) {
		whenever(shellTaskOrganizer.getRunningTaskInfo(task.taskId)).thenReturn(null)
		whenever(recentTasksController.findTaskInBackground(task.taskId))
		.thenReturn(createRecentTaskInfo(taskId = task.taskId, displayId = INVALID_DISPLAY))
		} else {
		whenever(shellTaskOrganizer.getRunningTaskInfo(task.taskId)).thenReturn(task)
		runningTasks.add(task)
		}
		return task
		}