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

Commit cc416559 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update display windowing mode when default display is added" into main

parents 50f90eda b9bf2111

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

+4 −3
Original line number Diff line number Diff line
@@ -120,10 +120,11 @@ class DesktopDisplayEventHandler( 
            }

            if (displayId != DEFAULT_DISPLAY) {

                desktopDisplayModeController.updateExternalDisplayWindowingMode(displayId)

            }

            // The default display's windowing mode depends on the availability of the external

                // display. So updating the default display's windowing mode here.

            // display. So updating the default display's windowing mode regardless of the type of

            // `displayId`.

            desktopDisplayModeController.updateDefaultDisplayWindowingMode()

            }

            if (DesktopExperienceFlags.ENABLE_DISPLAY_RECONNECT_INTERACTION.isTrue) {

                // TODO - b/365873835: Restore a display if a uniqueId match is found in

                //  the desktop repository.

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

+7 −0
Original line number Diff line number Diff line
@@ -413,6 +413,13 @@ class DesktopDisplayEventHandlerTest : ShellTestCase() { 
                )

        }



    @Test

    fun testConnectDefaultDisplay() {

        onDisplaysChangedListenerCaptor.lastValue.onDisplayAdded(DEFAULT_DISPLAY)

        verify(mockDesktopDisplayModeController, never()).updateExternalDisplayWindowingMode(any())

        verify(mockDesktopDisplayModeController).updateDefaultDisplayWindowingMode()

    }



    @Test

    fun testConnectExternalDisplay() {

        onDisplaysChangedListenerCaptor.lastValue.onDisplayAdded(externalDisplayId)