Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always execute logic to move desktop apps to front" into tm-qpr-dev am: b4fb274e59

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21545948

Change-Id: I8fbb78951354e3adf4f495be0921600f01ce77ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ats Jenk
2023-02-23 18:54:49 +00:00
committed by Automerger Merge Worker
parent dc535ab32e b4fb274e59
commit 3c49eec190
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,7 @@ class DesktopTasksController(
fun showDesktopApps() { fun showDesktopApps() {
ProtoLog.v(WM_SHELL_DESKTOP_MODE, "showDesktopApps") ProtoLog.v(WM_SHELL_DESKTOP_MODE, "showDesktopApps")
val wct = WindowContainerTransaction() val wct = WindowContainerTransaction()
bringDesktopAppsToFront(wct, force = true) bringDesktopAppsToFront(wct)
// Execute transaction if there are pending operations // Execute transaction if there are pending operations
if (!wct.isEmpty) { if (!wct.isEmpty) {
@@ -156,19 +156,9 @@ class DesktopTasksController(
?: WINDOWING_MODE_UNDEFINED ?: WINDOWING_MODE_UNDEFINED
} }
private fun bringDesktopAppsToFront(wct: WindowContainerTransaction, force: Boolean = false) { private fun bringDesktopAppsToFront(wct: WindowContainerTransaction) {
val activeTasks = desktopModeTaskRepository.getActiveTasks()
// Skip if all tasks are already visible
if (!force && activeTasks.all(desktopModeTaskRepository::isVisibleTask)) {
ProtoLog.d(
WM_SHELL_DESKTOP_MODE,
"bringDesktopAppsToFront: active tasks are already in front, skipping."
)
return
}
ProtoLog.v(WM_SHELL_DESKTOP_MODE, "bringDesktopAppsToFront") ProtoLog.v(WM_SHELL_DESKTOP_MODE, "bringDesktopAppsToFront")
val activeTasks = desktopModeTaskRepository.getActiveTasks()
// First move home to front and then other tasks on top of it // First move home to front and then other tasks on top of it
moveHomeTaskToFront(wct) moveHomeTaskToFront(wct)