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

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

Merge changes from topics "3button-runner", "re-enable-flicker" into sc-dev am: 6788d2b5 

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

Change-Id: I74ce7d3ce179f4d35f833d0a2dc2ad07975226ec
parents 975a2c62 6788d2b5

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

+6 −0
Original line number Diff line number Diff line
@@ -89,6 +89,12 @@ class AppPairsTestCannotPairNonResizeableApps( 
    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    @FlakyTest

    @Test

    override fun navBarLayerIsAlwaysVisible() {

        super.navBarLayerIsAlwaysVisible()

    }



    @Presubmit

    @Test

    fun appPairsDividerIsInvisible() = testSpec.appPairsDividerIsInvisible()

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

+6 −0
Original line number Diff line number Diff line
@@ -103,6 +103,12 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( 
        }

    }



    @FlakyTest

    @Test

    override fun navBarLayerIsAlwaysVisible() {

        super.navBarLayerIsAlwaysVisible()

    }



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

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

+6 −0
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ class RotateTwoLaunchedAppsInAppPairsMode( 
            }

        }



    @FlakyTest

    @Test

    override fun statusBarLayerIsAlwaysVisible() {

        super.statusBarLayerIsAlwaysVisible()

    }



    @Presubmit

    @Test

    fun bothAppWindowsVisible() {

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

+6 −0
Original line number Diff line number Diff line
@@ -74,6 +74,12 @@ class RotateTwoLaunchedAppsRotateAndEnterAppPairsMode( 
    @Test

    override fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()



    @FlakyTest

    @Test

    override fun statusBarLayerIsAlwaysVisible() {

        super.statusBarLayerIsAlwaysVisible()

    }



    @Presubmit

    @Test

    fun bothAppWindowsVisible() {

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

+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,12 @@ abstract class RotateTwoLaunchedAppsTransition( 
            }

        }



    @FlakyTest

    @Test

    override fun navBarLayerIsAlwaysVisible() {

        super.navBarLayerIsAlwaysVisible()

    }



    @FlakyTest

    @Test

    override fun navBarLayerRotatesAndScales() {