Merge "Don't close Multi Desktop when navigating back" into main (922531c1) · Commits · e / os / android_frameworks_base

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

+16 −9

Original line number	Diff line number	Diff line
		@@ -3234,6 +3234,12 @@ class DesktopTasksController(
		task = task,
		)
		}

		// TODO(b/416014060): Check if task is really receiving a back gesture
		if (
		!(DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue &&
		DesktopExperienceFlags.ENABLE_EMPTY_DESK_ON_MINIMIZE.isTrue)
		) {
		val deactivationRunnable =
		performDesktopExitCleanupIfNeeded(
		taskId = task.taskId,
		@@ -3243,6 +3249,7 @@ class DesktopTasksController(
		forceToFullscreen = false,
		)
		deactivationRunnable?.invoke(transition)
		}

		if (!DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION.isTrue()) {
		taskRepository.addClosingTask(

+269 −0

File changed.

Preview size limit exceeded, changes collapsed.