Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18271954 authored by mattsziklay's avatar mattsziklay Committed by Matt Sziklay
Browse files

On display disconnect, check for global focused task in desk. 

Fixes an issue where all desks on a disconnected display would be moved
to top and activated if any of them had the globally focused task. The
toTop check only checks tasks in the desk that is currently being
reparented.

Bug: 391652399
Test: Manual, disconnect display with multiple desks
Flag: com.android.window.flags.enable_display_disconnect_interaction
Change-Id: I2a1916e679a0f3aa58b02e0035f49019c135f497
parent ca4fe6fd

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

+4 −5
Original line number Diff line number Diff line
@@ -691,12 +691,9 @@ class DesktopTasksController( 
            if (desktopModeSupportedOnDisplay) {

                // Desktop supported on display; reparent desks, focused desk on top.

                for (deskId in deskIds) {

                    val toTop =

                        desktopRepository

                            .getActiveTasks(disconnectedDisplayId)

                            .contains(focusTransitionObserver.globallyFocusedTaskId)

                    val deskTasks = desktopRepository.getActiveTaskIdsInDesk(deskId)

                    // Remove desk if it's empty.

                    if (desktopRepository.getActiveTasks(disconnectedDisplayId).isEmpty()) {

                    if (deskTasks.isEmpty()) {

                        desksOrganizer.removeDesk(wct, deskId, desktopRepository.userId)

                        desksTransitionObserver.addPendingTransition(

                            DeskTransition.RemoveDesk(
@@ -710,6 +707,8 @@ class DesktopTasksController( 
                        )

                    } else {

                        // Otherwise, reparent it to the destination display.

                        val toTop =

                            deskTasks.contains(focusTransitionObserver.globallyFocusedTaskId)

                        desksOrganizer.moveDeskToDisplay(wct, deskId, destinationDisplayId, toTop)

                        desksTransitionObserver.addPendingTransition(

                            DeskTransition.ChangeDeskDisplay(