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

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

Merge "Make desktop tests run only on tablets." into main

parents 70d2ba14 cb5b18e8

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/CloseAllAppsWithAppHeaderExit.kt

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


    @Before

    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode())

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)

        testApp.enterDesktopWithDrag(wmHelper, device)

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/EnterDesktopWithDrag.kt

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


    @Before

    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode())

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)

    }

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/ResizeAppWithCornerResize.kt

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


    @Before

    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode())

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)

        testApp.enterDesktopWithDrag(wmHelper, device)