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

Commit e4f32d44 authored by Ben Lin's avatar Ben Lin
Browse files

Projected Display: Disable enterDesktop if display does not support it. 

However for other methods e.g. ADB, Overview button, where the user is
explicitly trying to start freeform windows, we will not disallow it.

Bug: 384568161
Test: atest
Flag:com.android.window.flags.enable_projected_desktop_mode
Change-Id: If701e41097e561af8af892006c183ea92ff50094
parent 4a203e01

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

+9 −0
Original line number Diff line number Diff line
@@ -683,6 +683,15 @@ class DesktopTasksController( 
            return false

        }

        val displayId = getDisplayIdForTaskOrDefault(task)

        if (

            DesktopExperienceFlags.ENABLE_PROJECTED_DISPLAY_DESKTOP_MODE.isTrue &&

                !desktopState.isDesktopModeSupportedOnDisplay(displayId) &&

                transitionSource != DesktopModeTransitionSource.ADB_COMMAND &&

                transitionSource != DesktopModeTransitionSource.APP_FROM_OVERVIEW

        ) {

            logW("moveTaskToDefaultDeskAndActivate display=$displayId does not support desk")

            return false

        }

        if (!DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue) {

            val deskId = getOrCreateDefaultDeskId(displayId) ?: return false

            return moveTaskToDesk(

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

+63 −0
Original line number Diff line number Diff line
@@ -143,6 +143,11 @@ import com.android.wm.shell.recents.RecentsTransitionStateListener 
import com.android.wm.shell.recents.RecentsTransitionStateListener.TRANSITION_STATE_ANIMATING

import com.android.wm.shell.recents.RecentsTransitionStateListener.TRANSITION_STATE_REQUESTED

import com.android.wm.shell.shared.desktopmode.DesktopModeCompatPolicy

import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource.ADB_COMMAND

import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource.APP_FROM_OVERVIEW

import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource.APP_HANDLE_MENU_BUTTON

import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource.KEYBOARD_SHORTCUT

import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource.TASK_DRAG

import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource.UNKNOWN

import com.android.wm.shell.shared.desktopmode.FakeDesktopConfig

import com.android.wm.shell.shared.desktopmode.FakeDesktopState
@@ -1615,6 +1620,64 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
        assertThat(findBoundsChange(wct, task)).isEqualTo(UNRESIZABLE_LANDSCAPE_BOUNDS)

    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_PROJECTED_DISPLAY_DESKTOP_MODE)

    @DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)

    fun moveToDesktop_displayNotSupported_withOverButtonOrAdb_movesToDesk() {

        val spyController = spy(controller)

        desktopState.overrideDesktopModeSupportPerDisplay[DEFAULT_DISPLAY] = false

        val task = setUpFullscreenTask()

        spyController.moveTaskToDefaultDeskAndActivate(task.taskId, transitionSource = ADB_COMMAND)

        verify(spyController, times(1))

            .moveTaskToDesk(anyInt(), anyInt(), any(), eq(ADB_COMMAND), eq(null), eq(null))



        clearInvocations(desksOrganizer)



        spyController.moveTaskToDefaultDeskAndActivate(

            task.taskId,

            transitionSource = APP_FROM_OVERVIEW,

        )

        verify(spyController, times(1))

            .moveTaskToDesk(anyInt(), anyInt(), any(), eq(APP_FROM_OVERVIEW), eq(null), eq(null))

    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_PROJECTED_DISPLAY_DESKTOP_MODE)

    @DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)

    fun moveToDesktop_displayNotSupported_doesNothing() {

        val spyController = spy(controller)

        desktopState.overrideDesktopModeSupportPerDisplay[DEFAULT_DISPLAY] = false

        val task = setUpFullscreenTask()

        spyController.moveTaskToDefaultDeskAndActivate(task.taskId, transitionSource = UNKNOWN)

        verify(spyController, times(0))

            .moveTaskToDesk(anyInt(), anyInt(), any(), eq(UNKNOWN), eq(null), eq(null))



        spyController.moveTaskToDefaultDeskAndActivate(

            task.taskId,

            transitionSource = KEYBOARD_SHORTCUT,

        )

        verify(spyController, times(0))

            .moveTaskToDesk(anyInt(), anyInt(), any(), eq(KEYBOARD_SHORTCUT), eq(null), eq(null))



        spyController.moveTaskToDefaultDeskAndActivate(

            task.taskId,

            transitionSource = APP_HANDLE_MENU_BUTTON,

        )

        verify(spyController, times(0))

            .moveTaskToDesk(

                anyInt(),

                anyInt(),

                any(),

                eq(APP_HANDLE_MENU_BUTTON),

                eq(null),

                eq(null),

            )



        spyController.moveTaskToDefaultDeskAndActivate(task.taskId, transitionSource = TASK_DRAG)

        verify(spyController, times(0))

            .moveTaskToDesk(anyInt(), anyInt(), any(), eq(TASK_DRAG), eq(null), eq(null))

    }



    @Test

    @DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)

    fun moveToDesktop_tdaFullscreen_windowingModeSetToFreeform() {