Merge "Use transient Home launch in enter/cancel transition" into main (fe62705a) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityOptions.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -2563,11 +2563,14 @@ public class ActivityOptions extends ComponentOptions {
		public static final int TYPE_LOCKSCREEN = 3;
		/** Launched from recents gesture handler. */
		public static final int TYPE_RECENTS_ANIMATION = 4;
		/** Launched from desktop's transition handler. */
		public static final int TYPE_DESKTOP_ANIMATION = 5;

		@IntDef(prefix = { "TYPE_" }, value = {
		TYPE_LAUNCHER,
		TYPE_NOTIFICATION,
		TYPE_LOCKSCREEN,
		TYPE_DESKTOP_ANIMATION
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface SourceType {}

libs/WindowManager/Shell/src/com/android/wm/shell/RootTaskDisplayAreaOrganizer.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,19 @@ public class RootTaskDisplayAreaOrganizer extends DisplayAreaOrganizer {
		b.setParent(sc);
		}

		/**
		* Re-parents the provided surface to the leash of the provided display.
		*
		* @param displayId the display area to reparent to.
		* @param sc the surface to be reparented.
		* @param t a {@link SurfaceControl.Transaction} in which to reparent.
		*/
		public void reparentToDisplayArea(int displayId, SurfaceControl sc,
		SurfaceControl.Transaction t) {
		final SurfaceControl displayAreaLeash = mLeashes.get(displayId);
		t.reparent(sc, displayAreaLeash);
		}

		public void setPosition(@NonNull SurfaceControl.Transaction tx, int displayId, int x, int y) {
		final SurfaceControl sc = mLeashes.get(displayId);
		if (sc == null) {

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ import com.android.wm.shell.dagger.pip.PipModule;
		import com.android.wm.shell.desktopmode.DesktopModeStatus;
		import com.android.wm.shell.desktopmode.DesktopModeTaskRepository;
		import com.android.wm.shell.desktopmode.DesktopTasksController;
		import com.android.wm.shell.desktopmode.DragToDesktopTransitionHandler;
		import com.android.wm.shell.desktopmode.EnterDesktopTaskTransitionHandler;
		import com.android.wm.shell.desktopmode.ExitDesktopTaskTransitionHandler;
		import com.android.wm.shell.desktopmode.ToggleResizeDesktopTaskTransitionHandler;
		@@ -498,6 +499,7 @@ public abstract class WMShellModule {
		EnterDesktopTaskTransitionHandler enterDesktopTransitionHandler,
		ExitDesktopTaskTransitionHandler exitDesktopTransitionHandler,
		ToggleResizeDesktopTaskTransitionHandler toggleResizeDesktopTaskTransitionHandler,
		DragToDesktopTransitionHandler dragToDesktopTransitionHandler,
		@DynamicOverride DesktopModeTaskRepository desktopModeTaskRepository,
		LaunchAdjacentController launchAdjacentController,
		RecentsTransitionHandler recentsTransitionHandler,
		@@ -506,8 +508,19 @@ public abstract class WMShellModule {
		return new DesktopTasksController(context, shellInit, shellCommandHandler, shellController,
		displayController, shellTaskOrganizer, syncQueue, rootTaskDisplayAreaOrganizer,
		transitions, enterDesktopTransitionHandler, exitDesktopTransitionHandler,
		toggleResizeDesktopTaskTransitionHandler, desktopModeTaskRepository,
		launchAdjacentController, recentsTransitionHandler, mainExecutor);
		toggleResizeDesktopTaskTransitionHandler, dragToDesktopTransitionHandler,
		desktopModeTaskRepository, launchAdjacentController, recentsTransitionHandler,
		mainExecutor);
		}

		@WMSingleton
		@Provides
		static DragToDesktopTransitionHandler provideDragToDesktopTransitionHandler(
		Context context,
		Transitions transitions,
		RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer) {
		return new DragToDesktopTransitionHandler(context, transitions,
		rootTaskDisplayAreaOrganizer);
		}

		@WMSingleton

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

+77 −65

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ import com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_BOT
		import com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT
		import com.android.wm.shell.desktopmode.DesktopModeTaskRepository.VisibleTasksListener
		import com.android.wm.shell.desktopmode.DesktopModeVisualIndicator.TO_DESKTOP_INDICATOR
		import com.android.wm.shell.desktopmode.DragToDesktopTransitionHandler.DragToDesktopStateListener
		import com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE
		import com.android.wm.shell.recents.RecentsTransitionHandler
		import com.android.wm.shell.recents.RecentsTransitionStateListener
		@@ -92,6 +93,7 @@ class DesktopTasksController(
		private val exitDesktopTaskTransitionHandler: ExitDesktopTaskTransitionHandler,
		private val toggleResizeDesktopTaskTransitionHandler:
		ToggleResizeDesktopTaskTransitionHandler,
		private val dragToDesktopTransitionHandler: DragToDesktopTransitionHandler,
		private val desktopModeTaskRepository: DesktopModeTaskRepository,
		private val launchAdjacentController: LaunchAdjacentController,
		private val recentsTransitionHandler: RecentsTransitionHandler,
		@@ -110,6 +112,20 @@ class DesktopTasksController(
		launchAdjacentController.launchAdjacentEnabled = !hasVisibleFreeformTasks
		}
		}
		private val dragToDesktopStateListener = object : DragToDesktopStateListener {
		override fun onCommitToDesktopAnimationStart(tx: SurfaceControl.Transaction) {
		removeVisualIndicator(tx)
		}

		override fun onCancelToDesktopAnimationEnd(tx: SurfaceControl.Transaction) {
		removeVisualIndicator(tx)
		}

		private fun removeVisualIndicator(tx: SurfaceControl.Transaction) {
		visualIndicator?.releaseVisualIndicator(tx)
		visualIndicator = null
		}
		}

		private val transitionAreaHeight
		get() = context.resources.getDimensionPixelSize(
		@@ -122,9 +138,7 @@ class DesktopTasksController(
		)

		private var recentsAnimationRunning = false

		// This is public to avoid cyclic dependency; it is set by SplitScreenController
		lateinit var splitScreenController: SplitScreenController
		private lateinit var splitScreenController: SplitScreenController

		init {
		desktopMode = DesktopModeImpl()
		@@ -143,7 +157,7 @@ class DesktopTasksController(
		)
		transitions.addHandler(this)
		desktopModeTaskRepository.addVisibleTasksListener(taskVisibilityListener, mainExecutor)

		dragToDesktopTransitionHandler.setDragToDesktopStateListener(dragToDesktopStateListener)
		recentsTransitionHandler.addTransitionStateListener(
		object : RecentsTransitionStateListener {
		override fun onAnimationStateChanged(running: Boolean) {
		@@ -158,6 +172,12 @@ class DesktopTasksController(
		)
		}

		/** Setter needed to avoid cyclic dependency. */
		fun setSplitScreenController(controller: SplitScreenController) {
		splitScreenController = controller
		dragToDesktopTransitionHandler.setSplitScreenController(controller)
		}

		/** Show all tasks, that are part of the desktop, on top of launcher */
		fun showDesktopApps(displayId: Int, remoteTransition: RemoteTransition? = null) {
		KtProtoLog.v(WM_SHELL_DESKTOP_MODE, "DesktopTasksController: showDesktopApps")
		@@ -248,56 +268,43 @@ class DesktopTasksController(
		}

		/**
		* The first part of the animated move to desktop transition. Applies the changes to move task
		* to desktop mode and sets the taskBounds to the passed in bounds, startBounds. This is
		* followed with a call to {@link finishMoveToDesktop} or {@link cancelMoveToDesktop}.
		* The first part of the animated drag to desktop transition. This is
		* followed with a call to [finalizeDragToDesktop] or [cancelDragToDesktop].
		*/
		fun startMoveToDesktop(
		fun startDragToDesktop(
		taskInfo: RunningTaskInfo,
		startBounds: Rect,
		dragToDesktopValueAnimator: MoveToDesktopAnimator
		dragToDesktopValueAnimator: MoveToDesktopAnimator,
		windowDecor: DesktopModeWindowDecoration
		) {
		KtProtoLog.v(
		WM_SHELL_DESKTOP_MODE,
		"DesktopTasksController: startMoveToDesktop taskId=%d",
		"DesktopTasksController: startDragToDesktop taskId=%d",
		taskInfo.taskId
		)
		val wct = WindowContainerTransaction()
		exitSplitIfApplicable(wct, taskInfo)
		moveHomeTaskToFront(wct)
		addMoveToDesktopChanges(wct, taskInfo)
		wct.setBounds(taskInfo.token, startBounds)

		if (Transitions.ENABLE_SHELL_TRANSITIONS) {
		enterDesktopTaskTransitionHandler.startMoveToDesktop(wct, dragToDesktopValueAnimator,
		mOnAnimationFinishedCallback)
		} else {
		shellTaskOrganizer.applyTransaction(wct)
		}
		dragToDesktopTransitionHandler.startDragToDesktopTransition(
		taskInfo.taskId,
		dragToDesktopValueAnimator,
		windowDecor
		)
		}

		/**
		* The second part of the animated move to desktop transition, called after
		* {@link startMoveToDesktop}. Brings apps to front and sets freeform task bounds.
		* The second part of the animated drag to desktop transition, called after
		* [startDragToDesktop].
		*/
		private fun finalizeMoveToDesktop(taskInfo: RunningTaskInfo, freeformBounds: Rect) {
		private fun finalizeDragToDesktop(taskInfo: RunningTaskInfo, freeformBounds: Rect) {
		KtProtoLog.v(
		WM_SHELL_DESKTOP_MODE,
		"DesktopTasksController: finalizeMoveToDesktop taskId=%d",
		"DesktopTasksController: finalizeDragToDesktop taskId=%d",
		taskInfo.taskId
		)
		val wct = WindowContainerTransaction()
		exitSplitIfApplicable(wct, taskInfo)
		moveHomeTaskToFront(wct)
		bringDesktopAppsToFront(taskInfo.displayId, wct)
		addMoveToDesktopChanges(wct, taskInfo)
		wct.setBounds(taskInfo.token, freeformBounds)

		if (Transitions.ENABLE_SHELL_TRANSITIONS) {
		enterDesktopTaskTransitionHandler.finalizeMoveToDesktop(wct,
		mOnAnimationFinishedCallback)
		} else {
		shellTaskOrganizer.applyTransaction(wct)
		releaseVisualIndicator()
		}
		dragToDesktopTransitionHandler.finishDragToDesktopTransition(wct)
		}

		/**
		@@ -353,40 +360,40 @@ class DesktopTasksController(
		}

		private fun exitSplitIfApplicable(wct: WindowContainerTransaction, taskInfo: RunningTaskInfo) {
		if (taskInfo.windowingMode == WINDOWING_MODE_MULTI_WINDOW) {
		splitScreenController.prepareExitSplitScreen(wct,
		splitScreenController.getStageOfTask(taskInfo.taskId), EXIT_REASON_ENTER_DESKTOP)
		if (splitScreenController.isTaskInSplitScreen(taskInfo.taskId)) {
		splitScreenController.prepareExitSplitScreen(
		wct,
		splitScreenController.getStageOfTask(taskInfo.taskId),
		EXIT_REASON_ENTER_DESKTOP
		)
		getOtherSplitTask(taskInfo.taskId)?.let { otherTaskInfo ->
		wct.removeTask(otherTaskInfo.token)
		}
		}
		}

		private fun getOtherSplitTask(taskId: Int): RunningTaskInfo? {
		val remainingTaskPosition: Int =
		if (splitScreenController.getSplitPosition(taskId)
		== SPLIT_POSITION_BOTTOM_OR_RIGHT) {
		SPLIT_POSITION_TOP_OR_LEFT
		} else {
		SPLIT_POSITION_BOTTOM_OR_RIGHT
		}
		return splitScreenController.getTaskInfo(remainingTaskPosition)
		}

		/**
		* The second part of the animated move to desktop transition, called after
		* {@link startMoveToDesktop}. Move a task to fullscreen after being dragged from fullscreen
		* and released back into status bar area.
		* The second part of the animated drag to desktop transition, called after
		* [startDragToDesktop].
		*/
		fun cancelMoveToDesktop(task: RunningTaskInfo, moveToDesktopAnimator: MoveToDesktopAnimator) {
		fun cancelDragToDesktop(task: RunningTaskInfo) {
		KtProtoLog.v(
		WM_SHELL_DESKTOP_MODE,
		"DesktopTasksController: cancelMoveToDesktop taskId=%d",
		"DesktopTasksController: cancelDragToDesktop taskId=%d",
		task.taskId
		)
		val wct = WindowContainerTransaction()
		wct.setBounds(task.token, Rect())

		if (Transitions.ENABLE_SHELL_TRANSITIONS) {
		enterDesktopTaskTransitionHandler.startCancelMoveToDesktopMode(wct,
		moveToDesktopAnimator) { t ->
		val callbackWCT = WindowContainerTransaction()
		visualIndicator?.releaseVisualIndicator(t)
		visualIndicator = null
		addMoveToFullscreenChanges(callbackWCT, task)
		transitions.startTransition(TRANSIT_CHANGE, callbackWCT, null /* handler */)
		}
		} else {
		addMoveToFullscreenChanges(wct, task)
		shellTaskOrganizer.applyTransaction(wct)
		releaseVisualIndicator()
		}
		dragToDesktopTransitionHandler.cancelDragToDesktopTransition()
		}

		private fun moveToFullscreenWithAnimation(task: RunningTaskInfo, position: Point) {
		@@ -966,6 +973,11 @@ class DesktopTasksController(
		visualIndicator = DesktopModeVisualIndicator(syncQueue, taskInfo,
		displayController, context, taskSurface, shellTaskOrganizer,
		rootTaskDisplayAreaOrganizer, TO_DESKTOP_INDICATOR)
		// TODO(b/301106941): don't show the indicator until the drag-to-desktop animation has
		// started, or it'll be visible too early on top of the task surface, especially in
		// the cancel-early case. Also because it shouldn't even be shown in the cancel-early
		// case since its dismissal is tied to the cancel animation end, which doesn't even run
		// in cancel-early.
		visualIndicator?.createIndicatorWithAnimatedBounds()
		}
		val indicator = visualIndicator ?: return
		@@ -988,7 +1000,7 @@ class DesktopTasksController(
		taskInfo: RunningTaskInfo,
		freeformBounds: Rect
		) {
		finalizeMoveToDesktop(taskInfo, freeformBounds)
		finalizeDragToDesktop(taskInfo, freeformBounds)
		}

		private fun getStatusBarHeight(taskInfo: RunningTaskInfo): Int {

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

0 → 100644

+543 −0

File added.

Preview size limit exceeded, changes collapsed.