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

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

Fix use of NavigationModeRule on flicker am: e852b071 

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

Change-Id: Ie527d010cad5e8c5cbbca58c2750141337cf03b8
parents 4ff60ab1 e852b071

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

+8 −0
Original line number Diff line number Diff line
@@ -17,11 +17,13 @@ 
package com.android.wm.shell.flicker.apppairs



import android.view.Surface

import androidx.test.filters.FlakyTest

import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.helpers.setRotation

import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen

import com.android.wm.shell.flicker.helpers.SplitScreenHelper

import org.junit.Test



abstract class RotateTwoLaunchedAppsTransition(

    testSpec: FlickerTestParameter
@@ -49,4 +51,10 @@ abstract class RotateTwoLaunchedAppsTransition( 
                }

            }

        }



    @FlakyTest

    @Test

    override fun navBarLayerRotatesAndScales() {

        super.navBarLayerRotatesAndScales()

    }

}
 
 No newline at end of file

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ class LegacySplitScreenToLauncher( 
    fun statusBarLayerRotatesScales() =

        testSpec.statusBarLayerRotatesScales(testSpec.config.endRotation)



    @Presubmit

    @FlakyTest

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()

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

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ class SwitchImeWindowsFromGestureNavTest(private val testSpec: FlickerTestParame 
                    .getConfigNonRotationTests(

                            repetitions = 3,

                            supportedNavigationModes = listOf(

                                    WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY,

                                    WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY,

                                    WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY

                            )

                    )

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt

+12 −0
Original line number Diff line number Diff line
@@ -66,6 +66,18 @@ class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp 
        super.visibleLayersShownMoreThanOneConsecutiveEntry()

    }



    @FlakyTest

    @Test

    override fun navBarLayerRotatesAndScales() {

        super.navBarLayerRotatesAndScales()

    }



    @FlakyTest

    @Test

    override fun focusChanges() {

        super.focusChanges()

    }



    companion object {

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

        @JvmStatic

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt

+6 −0
Original line number Diff line number Diff line
@@ -69,6 +69,12 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp 
        super.focusChanges()

    }



    @FlakyTest

    @Test

    override fun navBarLayerRotatesAndScales() {

        super.navBarLayerRotatesAndScales()

    }



    @FlakyTest

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {