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

Commit 500e4e6f authored by Thales Lima's avatar Thales Lima
Browse files

Don't close Multi Desktop when navigating back 

Fixes: 410493575
Test: DesktopTasksControllerTest
Flag: com.android.window.flags.enable_multiple_desktops_backend
Change-Id: I5903d9bd81bed32b4b22863bf3fb1a2753810953
parent e2cd7fc5

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

+16 −9
Original line number Diff line number Diff line
@@ -3234,6 +3234,12 @@ class DesktopTasksController( 
                task = task,

            )

        }



        // TODO(b/416014060): Check if task is really receiving a back gesture

        if (

            !(DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue &&

                DesktopExperienceFlags.ENABLE_EMPTY_DESK_ON_MINIMIZE.isTrue)

        ) {

            val deactivationRunnable =

                performDesktopExitCleanupIfNeeded(

                    taskId = task.taskId,
@@ -3243,6 +3249,7 @@ class DesktopTasksController( 
                    forceToFullscreen = false,

                )

            deactivationRunnable?.invoke(transition)

        }



        if (!DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION.isTrue()) {

            taskRepository.addClosingTask(

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt

+269 −0

File changed.

Preview size limit exceeded, changes collapsed.