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

Commit 51035a15 authored by Garfield Tan's avatar Garfield Tan
Browse files

Use RootTDAOrganizer to obtain TDA windowing mode in desktop mode 

For the time being, we only change the root TDA's windowing mode, so it
is OK for us to use the root TDA's windowing mode to resolve the final
windowing mode request in desktop mode.

Bug: 333724879
Test: Enter/exit desktop mode still works. The task windowing mode isn't
overriding its container's.
Test: atest DesktopTasksControllerTest

Change-Id: I9469b597445efa4dc75c0fc8e2d48ba0e4c6f937
parent d1ff8ae8

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

+6 −4
Original line number Diff line number Diff line
@@ -889,8 +889,9 @@ class DesktopTasksController( 
        wct: WindowContainerTransaction,

        taskInfo: RunningTaskInfo

    ) {

        val displayWindowingMode = taskInfo.configuration.windowConfiguration.displayWindowingMode

        val targetWindowingMode = if (displayWindowingMode == WINDOWING_MODE_FREEFORM) {

        val tdaInfo = rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(taskInfo.displayId)!!

        val tdaWindowingMode = tdaInfo.configuration.windowConfiguration.windowingMode

        val targetWindowingMode = if (tdaWindowingMode == WINDOWING_MODE_FREEFORM) {

            // Display windowing is freeform, set to undefined and inherit it

            WINDOWING_MODE_UNDEFINED

        } else {
@@ -907,8 +908,9 @@ class DesktopTasksController( 
        wct: WindowContainerTransaction,

        taskInfo: RunningTaskInfo

    ) {

        val displayWindowingMode = taskInfo.configuration.windowConfiguration.displayWindowingMode

        val targetWindowingMode = if (displayWindowingMode == WINDOWING_MODE_FULLSCREEN) {

        val tdaInfo = rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(taskInfo.displayId)!!

        val tdaWindowingMode = tdaInfo.configuration.windowConfiguration.windowingMode

        val targetWindowingMode = if (tdaWindowingMode == WINDOWING_MODE_FULLSCREEN) {

            // Display windowing is fullscreen, set to undefined and inherit it

            WINDOWING_MODE_UNDEFINED

        } else {

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

+21 −13
Original line number Diff line number Diff line
@@ -161,6 +161,10 @@ class DesktopTasksControllerTest : ShellTestCase() { 
                (i.arguments.first() as Rect).set(STABLE_BOUNDS)

            }



        val tda = DisplayAreaInfo(MockToken().token(), DEFAULT_DISPLAY, 0)

        tda.configuration.windowConfiguration.windowingMode = WINDOWING_MODE_FULLSCREEN

        whenever(rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(DEFAULT_DISPLAY)).thenReturn(tda)



        controller = createController()

        controller.setSplitScreenController(splitScreenController)
@@ -336,9 +340,10 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    }



    @Test

    fun moveToDesktop_displayFullscreen_windowingModeSetToFreeform() {

    fun moveToDesktop_tdaFullscreen_windowingModeSetToFreeform() {

        val task = setUpFullscreenTask()

        task.configuration.windowConfiguration.displayWindowingMode = WINDOWING_MODE_FULLSCREEN

        val tda = rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(DEFAULT_DISPLAY)!!

        tda.configuration.windowConfiguration.windowingMode = WINDOWING_MODE_FULLSCREEN

        controller.moveToDesktop(task)

        val wct = getLatestMoveToDesktopWct()

        assertThat(wct.changes[task.token.asBinder()]?.windowingMode)
@@ -346,9 +351,10 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    }



    @Test

    fun moveToDesktop_displayFreeform_windowingModeSetToUndefined() {

    fun moveToDesktop_tdaFreeform_windowingModeSetToUndefined() {

        val task = setUpFullscreenTask()

        task.configuration.windowConfiguration.displayWindowingMode = WINDOWING_MODE_FREEFORM

        val tda = rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(DEFAULT_DISPLAY)!!

        tda.configuration.windowConfiguration.windowingMode = WINDOWING_MODE_FREEFORM

        controller.moveToDesktop(task)

        val wct = getLatestMoveToDesktopWct()

        assertThat(wct.changes[task.token.asBinder()]?.windowingMode)
@@ -481,9 +487,10 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    }



    @Test

    fun moveToFullscreen_displayFullscreen_windowingModeSetToUndefined() {

    fun moveToFullscreen_tdaFullscreen_windowingModeSetToUndefined() {

        val task = setUpFreeformTask()

        task.configuration.windowConfiguration.displayWindowingMode = WINDOWING_MODE_FULLSCREEN

        val tda = rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(DEFAULT_DISPLAY)!!

        tda.configuration.windowConfiguration.windowingMode = WINDOWING_MODE_FULLSCREEN

        controller.moveToFullscreen(task.taskId)

        val wct = getLatestExitDesktopWct()

        assertThat(wct.changes[task.token.asBinder()]?.windowingMode)
@@ -491,9 +498,10 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    }



    @Test

    fun moveToFullscreen_displayFreeform_windowingModeSetToFullscreen() {

    fun moveToFullscreen_tdaFreeform_windowingModeSetToFullscreen() {

        val task = setUpFreeformTask()

        task.configuration.windowConfiguration.displayWindowingMode = WINDOWING_MODE_FREEFORM

        val tda = rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(DEFAULT_DISPLAY)!!

        tda.configuration.windowConfiguration.windowingMode = WINDOWING_MODE_FREEFORM

        controller.moveToFullscreen(task.taskId)

        val wct = getLatestExitDesktopWct()

        assertThat(wct.changes[task.token.asBinder()]?.windowingMode)
@@ -684,7 +692,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
                createTransition(freeformTask2, type = TRANSIT_TO_FRONT)

            )

        assertThat(result?.changes?.get(freeformTask2.token.asBinder())?.windowingMode)

            .isEqualTo(WINDOWING_MODE_FULLSCREEN)

            .isEqualTo(WINDOWING_MODE_UNDEFINED) // inherited FULLSCREEN

    }



    @Test
@@ -694,7 +702,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
        val task = createFreeformTask()

        val result = controller.handleRequest(Binder(), createTransition(task))

        assertThat(result?.changes?.get(task.token.asBinder())?.windowingMode)

            .isEqualTo(WINDOWING_MODE_FULLSCREEN)

            .isEqualTo(WINDOWING_MODE_UNDEFINED) // inherited FULLSCREEN

    }



    @Test
@@ -706,7 +714,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 


        val result = controller.handleRequest(Binder(), createTransition(taskDefaultDisplay))

        assertThat(result?.changes?.get(taskDefaultDisplay.token.asBinder())?.windowingMode)

            .isEqualTo(WINDOWING_MODE_FULLSCREEN)

            .isEqualTo(WINDOWING_MODE_UNDEFINED) // inherited FULLSCREEN

    }



    @Test
@@ -792,7 +800,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 


        val result = controller.handleRequest(Binder(), createTransition(task))

        assertThat(result?.changes?.get(task.token.asBinder())?.windowingMode)

                .isEqualTo(WINDOWING_MODE_FULLSCREEN)

                .isEqualTo(WINDOWING_MODE_UNDEFINED) // inherited FULLSCREEN

    }



    @Test
@@ -895,7 +903,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 


        val wct = getLatestExitDesktopWct()

        assertThat(wct.changes[task2.token.asBinder()]?.windowingMode)

                .isEqualTo(WINDOWING_MODE_FULLSCREEN)

                .isEqualTo(WINDOWING_MODE_UNDEFINED) // inherited FULLSCREEN

    }



    @Test