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

Commit 2b345ed2 authored by mattsziklay's avatar mattsziklay
Browse files

Ensure tasks are properly resized on disconnect. 

Fixes an issue where a task set to minimum bounds on an external
display becomes too small on disconnect. This CL uses the existing
applyFreeformDisplayChange method to resize on disconnect based on
densityDpi of both displays.

Bug: 415222540
Test: Manual, set task to min width/height on external display, then
disconnect.
Flag: com.android.window.flags.enable_display_disconnect_interaction

Change-Id: I25a306578fb1b15c87d231897884230d0df3382f
parent 5c9d2f47

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

+1 −0
Original line number Diff line number Diff line
@@ -752,6 +752,7 @@ class DesktopTasksController( 
                            destDisplayLayout?.densityDpi()?.let {

                                wct.setDensityDpi(task.token, it)

                            }

                            applyFreeformDisplayChange(wct, task, destinationDisplayId, deskId)

                        }

                        desksTransitionObserver.addPendingTransition(

                            DeskTransition.ChangeDeskDisplay(

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

+36 −0
Original line number Diff line number Diff line
@@ -391,6 +391,8 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
        whenever(displayLayout.getStableBounds(any())).thenAnswer { i ->

            (i.arguments.first() as Rect).set(STABLE_BOUNDS)

        }

        whenever(displayLayout.width()).thenReturn(STABLE_BOUNDS.width())

        whenever(displayLayout.height()).thenReturn(STABLE_BOUNDS.height())

        whenever(displayLayout.densityDpi()).thenReturn(160)

        whenever(runBlocking { persistentRepository.readDesktop(any(), any()) })

            .thenReturn(Desktop.getDefaultInstance())
@@ -10396,6 +10398,40 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
            )

    }



    @Test

    @EnableFlags(

        Flags.FLAG_ENABLE_DISPLAY_DISCONNECT_INTERACTION,

        Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,

    )

    fun onDisplayDisconnect_desktopModeSupported_taskResizedBasedOnDensity() {

        val defaultDisplayTask = setUpFreeformTask()

        val transition = Binder()

        val secondDisplayLayout = mock(DisplayLayout::class.java)

        whenever(displayController.getDisplayLayout(SECOND_DISPLAY)).thenReturn(secondDisplayLayout)

        whenever(secondDisplayLayout.height()).thenReturn(1600)

        whenever(secondDisplayLayout.width()).thenReturn(2560)

        whenever(secondDisplayLayout.densityDpi()).thenReturn(240)

        taskRepository.addDesk(SECOND_DISPLAY, DISCONNECTED_DESK_ID)

        taskRepository.setActiveDesk(displayId = SECOND_DISPLAY, deskId = DISCONNECTED_DESK_ID)

        val secondDisplayTask =

            setUpFreeformTask(

                    displayId = SECOND_DISPLAY,

                    deskId = DISCONNECTED_DESK_ID,

                    bounds = Rect(100, 100, 500, 500),

                )

                .apply { isResizeable = true }



        val wct =

            performDisplayDisconnectTransition(

                transition = transition,

                desktopSupportedOnDefaultDisplay = true,

                taskOnSecondDisplayHasFocus = true,

                defaultDisplayTask = defaultDisplayTask,

                secondDisplayTask = secondDisplayTask,

            )

        assertThat(findBoundsChange(wct, secondDisplayTask)).isEqualTo(Rect(33, 61, 299, 327))

    }



    private fun performDisplayDisconnectTransition(

        transition: IBinder,

        desktopSupportedOnDefaultDisplay: Boolean,