Fix use of NavigationModeRule on flicker
The method was ignored before and now should be activated to enable 3 button mode. Some tests become flaky in 3-button mode and should be disabled for the moment. Test: atest FlickerTests WMShellFlickerTests Bug: 162925924 Change-Id: Ife24ad85c302da6fc193f1a5a226722cfed51b2b
This commit is contained in:
@@ -17,11 +17,13 @@
|
|||||||
package com.android.wm.shell.flicker.apppairs
|
package com.android.wm.shell.flicker.apppairs
|
||||||
|
|
||||||
import android.view.Surface
|
import android.view.Surface
|
||||||
|
import androidx.test.filters.FlakyTest
|
||||||
import com.android.server.wm.flicker.FlickerTestParameter
|
import com.android.server.wm.flicker.FlickerTestParameter
|
||||||
import com.android.server.wm.flicker.dsl.FlickerBuilder
|
import com.android.server.wm.flicker.dsl.FlickerBuilder
|
||||||
import com.android.server.wm.flicker.helpers.setRotation
|
import com.android.server.wm.flicker.helpers.setRotation
|
||||||
import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen
|
import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen
|
||||||
import com.android.wm.shell.flicker.helpers.SplitScreenHelper
|
import com.android.wm.shell.flicker.helpers.SplitScreenHelper
|
||||||
|
import org.junit.Test
|
||||||
|
|
||||||
abstract class RotateTwoLaunchedAppsTransition(
|
abstract class RotateTwoLaunchedAppsTransition(
|
||||||
testSpec: FlickerTestParameter
|
testSpec: FlickerTestParameter
|
||||||
@@ -49,4 +51,10 @@ abstract class RotateTwoLaunchedAppsTransition(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@FlakyTest
|
||||||
|
@Test
|
||||||
|
override fun navBarLayerRotatesAndScales() {
|
||||||
|
super.navBarLayerRotatesAndScales()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -118,7 +118,7 @@ class LegacySplitScreenToLauncher(
|
|||||||
fun statusBarLayerRotatesScales() =
|
fun statusBarLayerRotatesScales() =
|
||||||
testSpec.statusBarLayerRotatesScales(testSpec.config.endRotation)
|
testSpec.statusBarLayerRotatesScales(testSpec.config.endRotation)
|
||||||
|
|
||||||
@Presubmit
|
@FlakyTest
|
||||||
@Test
|
@Test
|
||||||
override fun visibleLayersShownMoreThanOneConsecutiveEntry() =
|
override fun visibleLayersShownMoreThanOneConsecutiveEntry() =
|
||||||
super.visibleLayersShownMoreThanOneConsecutiveEntry()
|
super.visibleLayersShownMoreThanOneConsecutiveEntry()
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ class SwitchImeWindowsFromGestureNavTest(private val testSpec: FlickerTestParame
|
|||||||
.getConfigNonRotationTests(
|
.getConfigNonRotationTests(
|
||||||
repetitions = 3,
|
repetitions = 3,
|
||||||
supportedNavigationModes = listOf(
|
supportedNavigationModes = listOf(
|
||||||
WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY,
|
WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY,
|
||||||
WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY
|
WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -66,6 +66,18 @@ class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp
|
|||||||
super.visibleLayersShownMoreThanOneConsecutiveEntry()
|
super.visibleLayersShownMoreThanOneConsecutiveEntry()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@FlakyTest
|
||||||
|
@Test
|
||||||
|
override fun navBarLayerRotatesAndScales() {
|
||||||
|
super.navBarLayerRotatesAndScales()
|
||||||
|
}
|
||||||
|
|
||||||
|
@FlakyTest
|
||||||
|
@Test
|
||||||
|
override fun focusChanges() {
|
||||||
|
super.focusChanges()
|
||||||
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
@Parameterized.Parameters(name = "{0}")
|
@Parameterized.Parameters(name = "{0}")
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
|
|||||||
@@ -69,6 +69,12 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp
|
|||||||
super.focusChanges()
|
super.focusChanges()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@FlakyTest
|
||||||
|
@Test
|
||||||
|
override fun navBarLayerRotatesAndScales() {
|
||||||
|
super.navBarLayerRotatesAndScales()
|
||||||
|
}
|
||||||
|
|
||||||
@FlakyTest
|
@FlakyTest
|
||||||
@Test
|
@Test
|
||||||
override fun visibleLayersShownMoreThanOneConsecutiveEntry() {
|
override fun visibleLayersShownMoreThanOneConsecutiveEntry() {
|
||||||
|
|||||||
Reference in New Issue
Block a user