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

Commit 68b352e0 authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

Merge "Promote stable app pairs tests" into sc-dev am: 31182d23 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13690791

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37dabcb945c00c95e08542cadb3efc904a2fc7f6
parents 89a044e3 31182d23

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt

+3 −3
Original line number Diff line number Diff line
@@ -71,16 +71,16 @@ class RotateTwoLaunchedAppsInAppPairsMode( 
        }

    }



    @FlakyTest

    @Presubmit

    @Test

    fun appPairsDividerIsVisible() = testSpec.appPairsDividerIsVisible()



    @FlakyTest

    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0,

        testSpec.config.endRotation)



    @FlakyTest

    @Presubmit

    @Test

    fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales(Surface.ROTATION_0,

        testSpec.config.endRotation)

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt

+2 −11
Original line number Diff line number Diff line
@@ -76,17 +76,8 @@ class RotateTwoLaunchedAppsRotateAndEnterAppPairsMode( 


    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() {

        Assume.assumeFalse(isRotated)

        testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0, testSpec.config.endRotation)

    }



    @FlakyTest

    @Test

    fun navBarLayerRotatesAndScales_Flaky() {

        Assume.assumeTrue(isRotated)

        testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0, testSpec.config.endRotation)

    }

    fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales(

        Surface.ROTATION_0, testSpec.config.endRotation)



    @Presubmit

    @Test