summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author mattsziklay <mattsziklay@google.com> 2024-11-14 22:10:40 -0800
committer mattsziklay <mattsziklay@google.com> 2024-11-14 22:10:40 -0800
commit6b4d6ed074fd7c19a6f9074e36a84db26fefe28f (patch)
treee6df3beb19b00a16b988216524d80b4e622f9a5a
parent73439919d4463f6403ff2cc4e585c577df70b6a3 (diff)
Use addMoveToFullscreenChanges on fullscreen launch.
When a desktop is minimized and a task contained inside it is then launched in fullscreen, the windowing mode is always set to WINDOWING_MODE_FULLSCREEN. However, when the display windowing is fullscreen, the task should be set to WINDOWING_MODE_UNDEFINED to prevent issues with future split screen transitions (see ag/23624076 for more details). This is already done for other freeform -> fullscreen transitions, this CL just applies the logic to task launches. Bug: 372809656 Test: Manual Flag: EXEMPT bugfix Change-Id: Ib05f7b9912d3cc3b834b9e3217a56337de3c163d
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt7
1 files changed, 7 insertions, 0 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt
index 223038f84418..7112de33a180 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt
@@ -1603,6 +1603,13 @@ class DesktopTasksController(
transition, wct, task.displayId
)
}
+ } else if (taskRepository.isActiveTask(task.taskId)) {
+ // If a freeform task receives a request for a fullscreen launch, apply the same
+ // changes we do for similar transitions. The task not having WINDOWING_MODE_UNDEFINED
+ // set when needed can interfere with future split / multi-instance transitions.
+ return WindowContainerTransaction().also { wct ->
+ addMoveToFullscreenChanges(wct, task)
+ }
}
return null
}