summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
author Eghosa Ewansiha-Vlachavas <eevlachavas@google.com> 2025-02-27 03:24:47 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2025-02-27 03:24:47 -0800
commit40aa32b37c5db1e6f9e4f7277b7c39a02ede32a9 (patch)
tree14164912d7eb721e5ef9b4832b1dafd1fc4021b7 /libs
parent71f32e71ab67b7a971bcd81a79c3655e2bbe61e9 (diff)
parent3e4cf0cfef4b7b25e4d4ec36309cb93a9ae0a846 (diff)
Merge changes Ib0099b0f,I4c4de052 into main
* changes: [1/n] Enforce Shell desktop cascading in Launch Params [0/n] Create bug fix flag for Shell initial bounds regression
Diffstat (limited to 'libs')
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt4
1 files changed, 4 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 7e6325019ab1..5de3be4bbfc0 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
@@ -1246,6 +1246,10 @@ class DesktopTasksController(
pendingIntentBackgroundActivityStartMode =
ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOW_ALWAYS
launchBounds = bounds
+ if (DesktopModeFlags.ENABLE_SHELL_INITIAL_BOUNDS_REGRESSION_BUG_FIX.isTrue) {
+ // Sets launch bounds size as flexible so core can recalculate.
+ flexibleLaunchSize = true
+ }
}
wct.sendPendingIntent(pendingIntent, intent, ops.toBundle())