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

Commit 05c1f555 authored by Toshiki Kikuchi's avatar Toshiki Kikuchi
Browse files

Default-to-desktop based on the state of desktop first 

This CL consolidates default-to-desktop with desktop-first.
Default-to-desktop is no longer a per-device preference but the
universal connected display policy.

Bug: 406608393
Test: atest DesktopTasksControllerTest
Flag: com.android.window.flags.enable_desktop_first_based_default_to_desktop_bugfix
Change-Id: I8d462d7c977236fd5554f9cf62256153019b6146
parent 2a029127

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java

+3 −0
Original line number Diff line number Diff line
@@ -248,6 +248,9 @@ public class DesktopModeStatus { 
     * of the display's root [TaskDisplayArea] is set to WINDOWING_MODE_FREEFORM.

     */

    public static boolean enterDesktopByDefaultOnFreeformDisplay(@NonNull Context context) {

        if (DesktopExperienceFlags.ENABLE_DESKTOP_FIRST_BASED_DEFAULT_TO_DESKTOP_BUGFIX.isTrue()) {

            return true;

        }

        if (!DesktopExperienceFlags.ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAYS.isTrue()) {

            return false;

        }

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

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ interface DesktopState { 
     * Whether a display should enter desktop mode by default when the windowing mode of the

     * display's root [TaskDisplayArea] is set to `WINDOWING_MODE_FREEFORM`.

     */

    @Deprecated("Use isDisplayDesktopFirst() instead.", ReplaceWith("isDisplayDesktopFirst()"))

    @get:JvmName("enterDesktopByDefaultOnFreeformDisplay")

    val enterDesktopByDefaultOnFreeformDisplay: Boolean

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

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ class DesktopStateImpl(context: Context) : DesktopState { 
        Flags.showDesktopExperienceDevOption() && isDeviceEligibleForDesktopMode



    override val enterDesktopByDefaultOnFreeformDisplay: Boolean =

        DesktopExperienceFlags.ENABLE_DESKTOP_FIRST_BASED_DEFAULT_TO_DESKTOP_BUGFIX.isTrue ||

        DesktopExperienceFlags.ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAYS.isTrue &&

            SystemProperties.getBoolean(

                ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAY_SYS_PROP,

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

+5 −0
Original line number Diff line number Diff line
@@ -459,7 +459,12 @@ class DesktopTasksController( 
    private fun getSplitFocusedTask(task1: RunningTaskInfo, task2: RunningTaskInfo) =

        if (task1.taskId == task2.parentTaskId) task2 else task1



    @Deprecated("Use isDisplayDesktopFirst() instead.", ReplaceWith("isDisplayDesktopFirst()"))

    private fun forceEnterDesktop(displayId: Int): Boolean {

        if (DesktopExperienceFlags.ENABLE_DESKTOP_FIRST_BASED_DEFAULT_TO_DESKTOP_BUGFIX.isTrue) {

            return rootTaskDisplayAreaOrganizer.isDisplayDesktopFirst(displayId)

        }



        if (!desktopState.enterDesktopByDefaultOnFreeformDisplay) {

            return false

        }

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

+33 −1
Original line number Diff line number Diff line
@@ -2623,6 +2623,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
    @DisableFlags(

        Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,

        com.android.launcher3.Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING,

        Flags.FLAG_ENABLE_DESKTOP_FIRST_BASED_DEFAULT_TO_DESKTOP_BUGFIX,

    )

    fun moveToFullscreen_tdaFreeform_windowingModeFullscreen_removesWallpaperActivity() {

        desktopState.enterDesktopByDefaultOnFreeformDisplay = false
@@ -2684,6 +2685,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
        Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER,

        Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,

    )

    @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_FIRST_BASED_DEFAULT_TO_DESKTOP_BUGFIX)

    fun moveToFullscreen_tdaFreeform_windowingModeFullscreen_homeBehindFullscreen_multiDesksEnabled() {

        desktopState.enterDesktopByDefaultOnFreeformDisplay = false

        val homeTask = setUpHomeTask()
@@ -4892,6 +4894,29 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
        verify(desksOrganizer).moveTaskToDesk(wct, deskId, fullscreenTask)

    }



    @Test

    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

        Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,

        Flags.FLAG_ENABLE_DESKTOP_FIRST_BASED_DEFAULT_TO_DESKTOP_BUGFIX,

    )

    fun handleRequest_fullscreenTask_noInDesk_enforceDesktop_freeformDisplay_movesToDesk_desktopFirst() {

        // Ensure the force enter desktop works when the deprecated flag is off.

        desktopState.enterDesktopByDefaultOnFreeformDisplay = false

        val deskId = 0

        taskRepository.setDeskInactive(deskId)

        whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)

        desktopState.enterDesktopByDefaultOnFreeformDisplay = true

        val tda = rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(DEFAULT_DISPLAY)!!

        tda.configuration.windowConfiguration.windowingMode = WINDOWING_MODE_FREEFORM



        val fullscreenTask = createFullscreenTask()

        val wct = controller.handleRequest(Binder(), createTransition(fullscreenTask))



        assertNotNull(wct, "should handle request")

        verify(desksOrganizer).moveTaskToDesk(wct, deskId, fullscreenTask)

    }



    @Test

    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,
@@ -4903,6 +4928,10 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
        taskRepository.setDeskInactive(deskId)

        whenever(desktopWallpaperActivityTokenProvider.getToken()).thenReturn(null)

        desktopState.enterDesktopByDefaultOnFreeformDisplay = true

        assertNotNull(rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(DEFAULT_DISPLAY))

            .configuration

            .windowConfiguration

            .windowingMode = WINDOWING_MODE_FREEFORM



        val fullscreenTask = createFullscreenTask(displayId = SECONDARY_DISPLAY_ID)

        val wct = controller.handleRequest(Binder(), createTransition(fullscreenTask))
@@ -9974,7 +10003,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_ENABLE_DESKTOP_FIRST_BASED_DEFAULT_TO_DESKTOP_BUGFIX,

            )

    }

}