Merge "Update flicker tests using nav bar / task bar conditions" into main (216cea0f) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/bubble/src/com/android/wm/shell/flicker/bubble/OpenActivityFromBubbleOnLocksreenTest.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -100,14 +100,14 @@ class OpenActivityFromBubbleOnLocksreenTest(flicker: LegacyFlickerTest) :
		@Postsubmit
		@Test
		fun navBarLayerIsVisibleAtEnd() {
		Assume.assumeFalse(flicker.scenario.isTablet)
		Assume.assumeFalse(usesTaskbar)
		flicker.navBarLayerIsVisibleAtEnd()
		}

		@Postsubmit
		@Test
		fun navBarLayerPositionAtEnd() {
		Assume.assumeFalse(flicker.scenario.isTablet)
		Assume.assumeFalse(usesTaskbar)
		flicker.navBarLayerPositionAtEnd()
		}

		@@ -154,7 +154,7 @@ class OpenActivityFromBubbleOnLocksreenTest(flicker: LegacyFlickerTest) :
		@Postsubmit
		@Test
		fun taskBarLayerIsVisibleAtEnd() {
		Assume.assumeTrue(flicker.scenario.isTablet)
		Assume.assumeTrue(usesTaskbar)
		flicker.assertLayersEnd { this.isVisible(ComponentNameMatcher.TASK_BAR) }
		}
		}

libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/NetflixEnterPipTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ open class NetflixEnterPipTest(flicker: LegacyFlickerTest) : AppsEnterPipTransit
		@Postsubmit
		@Test
		override fun taskBarLayerIsVisibleAtStartAndEnd() {
		Assume.assumeTrue(flicker.scenario.isTablet)
		Assume.assumeTrue(usesTaskbar)
		// Netflix starts in immersive fullscreen mode, so taskbar bar is not visible at start
		flicker.assertLayersStart { this.isInvisible(ComponentNameMatcher.TASK_BAR) }
		flicker.assertLayersEnd { this.isVisible(ComponentNameMatcher.TASK_BAR) }

libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/apps/YouTubeEnterPipToOtherOrientationTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ open class YouTubeEnterPipToOtherOrientationTest(flicker: LegacyFlickerTest) :
		@Postsubmit
		@Test
		override fun taskBarLayerIsVisibleAtStartAndEnd() {
		Assume.assumeTrue(flicker.scenario.isTablet)
		Assume.assumeTrue(usesTaskbar)
		// YouTube starts in immersive fullscreen mode, so taskbar bar is not visible at start
		flicker.assertLayersStart { this.isInvisible(ComponentNameMatcher.TASK_BAR) }
		flicker.assertLayersEnd { this.isVisible(ComponentNameMatcher.TASK_BAR) }

tests/FlickerTests/ActivityEmbedding/src/com/android/server/wm/flicker/activityembedding/rotation/RotationTransition.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ abstract class RotationTransition(flicker: LegacyFlickerTest) : ActivityEmbeddin
		teardown { testApp.exit(wmHelper) }
		transitions {
		this.setRotation(flicker.scenario.endRotation)
		if (!flicker.scenario.isTablet) {
		if (!usesTaskbar) {
		wmHelper.StateSyncBuilder()
		.add(navBarInPosition(flicker.scenario.isGesturalNavigation))
		.waitForAndVerify()

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ open class OpenAppFromLockscreenViaIntentTest(flicker: LegacyFlickerTest) :
		@FlakyTest(bugId = 288341660)
		@Test
		fun navBarLayerVisibilityChanges() {
		Assume.assumeFalse(flicker.scenario.isTablet)
		Assume.assumeFalse(usesTaskbar)
		flicker.assertLayers {
		this.isInvisible(ComponentNameMatcher.NAV_BAR)
		.then()
		@@ -97,7 +97,7 @@ open class OpenAppFromLockscreenViaIntentTest(flicker: LegacyFlickerTest) :
		@FlakyTest(bugId = 293581770)
		@Test
		fun navBarWindowsVisibilityChanges() {
		Assume.assumeFalse(flicker.scenario.isTablet)
		Assume.assumeFalse(usesTaskbar)
		flicker.assertWm {
		this.isNonAppWindowInvisible(ComponentNameMatcher.NAV_BAR)
		.then()
		@@ -112,7 +112,7 @@ open class OpenAppFromLockscreenViaIntentTest(flicker: LegacyFlickerTest) :
		@Presubmit
		@Test
		fun taskBarLayerIsVisibleAtEnd() {
		Assume.assumeTrue(flicker.scenario.isTablet)
		Assume.assumeTrue(usesTaskbar)
		flicker.assertLayersEnd { this.isVisible(ComponentNameMatcher.TASK_BAR) }
		}

		@@ -170,7 +170,7 @@ open class OpenAppFromLockscreenViaIntentTest(flicker: LegacyFlickerTest) :
		@Presubmit
		@Test
		fun navBarLayerIsVisibleAtEnd() {
		Assume.assumeFalse(flicker.scenario.isTablet)
		Assume.assumeFalse(usesTaskbar)
		flicker.assertLayersEnd { this.isVisible(ComponentNameMatcher.NAV_BAR) }
		}

		@@ -184,7 +184,7 @@ open class OpenAppFromLockscreenViaIntentTest(flicker: LegacyFlickerTest) :
		@Presubmit
		@Test
		override fun appLayerBecomesVisible() {
		Assume.assumeFalse(flicker.scenario.isTablet)
		Assume.assumeFalse(usesTaskbar)
		super.appLayerBecomesVisible()
		}

		@@ -192,7 +192,7 @@ open class OpenAppFromLockscreenViaIntentTest(flicker: LegacyFlickerTest) :
		@FlakyTest(bugId = 227143265)
		@Test
		fun appLayerBecomesVisibleTablet() {
		Assume.assumeTrue(flicker.scenario.isTablet)
		Assume.assumeTrue(usesTaskbar)
		super.appLayerBecomesVisible()
		}