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

Commit 5ccc3e17 authored by Jorge Gil's avatar Jorge Gil Committed by Android (Google) Code Review
Browse files

Merge "Desks: Obtain default desk if needed behind flag" into main

parents 4c7f6263 6d04ae87

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

+4 −1
Original line number Diff line number Diff line
@@ -696,7 +696,10 @@ class DesktopTasksController( 
            logW("moveTaskToDefaultDeskAndActivate display=$displayId does not support desk")

            return false

        }

        if (!DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue) {

        if (

            !DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue ||

                !DesktopExperienceFlags.ENABLE_DEFAULT_DESK_WITHOUT_WARMUP_MIGRATION.isTrue

        ) {

            val deskId = getOrCreateDefaultDeskId(displayId) ?: return false

            return moveTaskToDesk(

                taskId = taskId,

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

+4 −1
Original line number Diff line number Diff line
@@ -9175,7 +9175,10 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> =

            FlagsParameterization.allCombinationsOf(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)

            FlagsParameterization.allCombinationsOf(

                Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,

                Flags.FLAG_DEFAULT_DESK_WITHOUT_WARMUP_MIGRATION,

            )

    }

}