Merge "Remove moveToDesktopWithoutDecor." into main (c4ce460e) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ class DesktopModeShellCommandHandler(private val controller: DesktopTasksControl
		return false
		}

		return controller.moveToDesktopWithoutDecor(taskId, WindowContainerTransaction())
		return controller.moveToDesktop(taskId, WindowContainerTransaction())
		}

		override fun printShellCommandHelp(pw: PrintWriter, prefix: String) {

+2 −35

Original line number	Diff line number	Diff line
		@@ -244,46 +244,13 @@ class DesktopTasksController(
		fun moveToDesktop(
		taskId: Int,
		wct: WindowContainerTransaction = WindowContainerTransaction()
		) {
		): Boolean {
		shellTaskOrganizer.getRunningTaskInfo(taskId)?.let {
		task -> moveToDesktop(task, wct)
		}
		}

		/** Move a task with given `taskId` to desktop without decor */
		fun moveToDesktopWithoutDecor(
		taskId: Int,
		wct: WindowContainerTransaction
		): Boolean {
		val task = shellTaskOrganizer.getRunningTaskInfo(taskId) ?: return false
		moveToDesktopWithoutDecor(task, wct)
		} ?: return false
		return true
		}

		/**
		* Move a task to desktop without decor
		*/
		private fun moveToDesktopWithoutDecor(
		task: RunningTaskInfo,
		wct: WindowContainerTransaction
		) {
		KtProtoLog.v(
		WM_SHELL_DESKTOP_MODE,
		"DesktopTasksController: moveToDesktopWithoutDecor taskId=%d",
		task.taskId
		)
		exitSplitIfApplicable(wct, task)
		// Bring other apps to front first
		bringDesktopAppsToFront(task.displayId, wct)
		addMoveToDesktopChanges(wct, task)

		if (Transitions.ENABLE_SHELL_TRANSITIONS) {
		transitions.startTransition(TRANSIT_CHANGE, wct, null /* handler */)
		} else {
		shellTaskOrganizer.applyTransaction(wct)
		}
		}

		/**
		* Move a task to desktop
		*/