Merge "Stop depending on transitions for tasks moving displays." into main (f54bb745) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1874,7 +1874,7 @@ class DesktopTasksController(
		logW("moveToDisplay: desk not found for display: $displayId")
		return
		}

		snapEventHandler.removeTaskIfTiled(task.displayId, task.taskId)
		// TODO: b/393977830 and b/397437641 - do not assume that freeform==desktop.
		if (!task.isFreeform) {
		addMoveToDeskTaskChanges(wct = wct, task = task, deskId = destinationDeskId)

+1 −4

Original line number	Diff line number	Diff line
		@@ -462,7 +462,7 @@ class DesktopTilingWindowDecoration(
		taskInfo.isFullscreen,
		)

		!isActiveTaskWithinDesk(taskInfo.taskId) ->
		!taskInfo.isFreeform ->
		removeTaskIfTiled(
		taskInfo.taskId,
		taskVanished = true,
		@@ -489,9 +489,6 @@ class DesktopTilingWindowDecoration(
		}
		}

		private fun isActiveTaskWithinDesk(taskId: Int): Boolean =
		desktopUserRepositories.current.getDeskIdForTask(taskId) == deskId

		private fun handleTaskBroughtToFront(taskId: Int) {
		if (taskId == leftTaskResizingHelper?.taskInfo?.taskId) {
		leftTaskResizingHelper?.onAppBecomingVisible()

+1 −0

Original line number	Diff line number	Diff line
		@@ -4050,6 +4050,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase()
		any<WindowContainerTransaction>(),
		isA(DesktopModeMoveToDisplayTransitionHandler::class.java),
		)
		verify(snapEventHandler, verificationMode).removeTaskIfTiled(task.displayId, task.taskId)
		}

		@Test