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

Commit decde23e authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Ensure we enter spitscreen based on requested rotation 

Bug: 300065764
Test: atest WMShellFlickerServiceTests
Change-Id: I32ccbcae9619432351a0cf77ef148804573c3870
parent f90c7172

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/AutoEnterPipFromSplitScreenOnGoToHomeTest.kt

+3 −1
Original line number Diff line number Diff line
@@ -80,7 +80,9 @@ class AutoEnterPipFromSplitScreenOnGoToHomeTest(flicker: LegacyFlickerTest) : 
                secondAppForSplitScreen.launchViaIntent(wmHelper)

                pipApp.launchViaIntent(wmHelper)

                tapl.goHome()

                SplitScreenUtils.enterSplit(wmHelper, tapl, device, pipApp, secondAppForSplitScreen)

                SplitScreenUtils.enterSplit(

                    wmHelper, tapl, device, pipApp, secondAppForSplitScreen,

                    flicker.scenario.startRotation)

                pipApp.enableAutoEnterForPipActivity()

            }

            teardown {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/CopyContentInSplit.kt

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 
        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)



        SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, textEditApp)

        SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, textEditApp, rotation)

    }



    @Test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/DismissSplitScreenByDivider.kt

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 
        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)



        SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, secondaryApp)

        SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, secondaryApp, rotation)

    }



    @Test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/DismissSplitScreenByGoHome.kt

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 
        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)



        SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, secondaryApp)

        SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, secondaryApp, rotation)

    }



    @Test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/splitscreen/scenarios/DragDividerToResize.kt

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { 
        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)



        SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, secondaryApp)

        SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, secondaryApp, rotation)

    }



    @Test