commit 156b9b318443805f6b12726eace0a88850ca041c
author Massimo Carli <mcarli@google.com> Mon Mar 10 14:30:35 2025 +0000
committer Massimo Carli <mcarli@google.com> Mon Mar 10 14:30:43 2025 +0000
tree 150b598173bd15f57818cf6c5c56b87aed637ca8
parent cfa59a3c2634edc80c12e12fe53fa70c0b128f44

Consider userId in transparent policy heuristic

Flag: com.android.window.flags.enable_modals_fullscreen_with_permission
Bug: 401583497
Test: atest NexusLauncherTests:com.android.quickstep.DesktopSystemShortcutTest
Test: atest NexusLauncherTests:com.android.quickstep.ExternalDisplaySystemShortcutTest

Change-Id: Ife36b3a7e2ba0376cf72ca545fa05c5a90d52f07

quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt

diff --git a/quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt b/quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt
index 914855b..4280baf 100644
--- a/quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt
+++ b/quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt
@@ -82,6 +82,7 @@
                             taskKey.numActivities,
                             taskKey.isTopActivityNoDisplay,
                             taskKey.isActivityStackTransparent,
+                            taskKey.userId,
                         ) -> null
 
                         !taskContainer.task.isDockable -> null

quickstep/src/com/android/quickstep/ExternalDisplaySystemShortcut.kt

diff --git a/quickstep/src/com/android/quickstep/ExternalDisplaySystemShortcut.kt b/quickstep/src/com/android/quickstep/ExternalDisplaySystemShortcut.kt
index f97cf9c..3b823f5 100644
--- a/quickstep/src/com/android/quickstep/ExternalDisplaySystemShortcut.kt
+++ b/quickstep/src/com/android/quickstep/ExternalDisplaySystemShortcut.kt
@@ -80,6 +80,7 @@
                             taskKey.numActivities,
                             taskKey.isTopActivityNoDisplay,
                             taskKey.isActivityStackTransparent,
+                            taskKey.userId,
                         ) -> null
 
                         else -> {