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

Commit 5bb1e06b authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Run tablet specific assertions only on tablets"

parents 32549e12 4faf3782

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt

+3 −1
Original line number Diff line number Diff line
@@ -106,7 +106,9 @@ class CloseImeWindowToAppTest(flicker: FlickerTest) : BaseTest(flicker) { 
    @IwTest(focusArea = "ime")

    override fun cujCompleted() {

        super.cujCompleted()

        if (!flicker.scenario.isTablet) {

            navBarLayerPositionAtStartAndEnd()

        }

        imeLayerBecomesInvisible()

        imeAppLayerIsAlwaysVisible()

        imeAppWindowIsAlwaysVisible()

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt

+3 −1
Original line number Diff line number Diff line
@@ -104,7 +104,9 @@ class CloseImeWindowToHomeTest(flicker: FlickerTest) : BaseTest(flicker) { 
    @IwTest(focusArea = "ime")

    override fun cujCompleted() {

        super.cujCompleted()

        if (!flicker.scenario.isTablet) {

            navBarLayerPositionAtStartAndEnd()

        }

        imeLayerBecomesInvisible()

        imeAppWindowBecomesInvisible()

        imeWindowBecomesInvisible()

tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt

+8 −4
Original line number Diff line number Diff line
@@ -213,6 +213,14 @@ open class SeamlessAppRotationTest(flicker: FlickerTest) : RotationTransition(fl 
            // not yet tablet compatible

            appLayerRotates()

            appLayerAlwaysVisible()

            // not tablet compatible

            navBarLayerIsVisibleAtStartAndEnd()

            navBarWindowIsAlwaysVisible()

        }



        if (flicker.scenario.isTablet) {

            taskBarLayerIsVisibleAtStartAndEnd()

            taskBarWindowIsAlwaysVisible()

        }



        appWindowFullScreen()
@@ -223,10 +231,6 @@ open class SeamlessAppRotationTest(flicker: FlickerTest) : RotationTransition(fl 
        appLayerRotates_StartingPos()

        appLayerRotates_EndingPos()

        entireScreenCovered()

        navBarLayerIsVisibleAtStartAndEnd()

        navBarWindowIsAlwaysVisible()

        taskBarLayerIsVisibleAtStartAndEnd()

        taskBarWindowIsAlwaysVisible()

        visibleLayersShownMoreThanOneConsecutiveEntry()

        visibleWindowsShownMoreThanOneConsecutiveEntry()

    }