Merge "Fix navbar layer visibility check on tablet" (cc4d221e) · Commits · e / os / android_frameworks_base

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

+20 −13

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ open class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) :
		@FlakyTest(bugId = 227083463)
		@Test
		fun navBarLayerVisibilityChanges() {
		Assume.assumeFalse(testSpec.isTablet)
		testSpec.assertLayers {
		this.isInvisible(ComponentMatcher.NAV_BAR)
		.then()
		@@ -136,27 +137,32 @@ open class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) :
		/** {@inheritDoc} */
		@Test
		@Ignore("Not applicable to this CUJ. Display starts off and app is full screen at the end")
		override fun taskBarLayerIsVisibleAtStartAndEnd() { }
		override fun taskBarLayerIsVisibleAtStartAndEnd() {
		}

		/** {@inheritDoc} */
		@Test
		@Ignore("Not applicable to this CUJ. Display starts off and app is full screen at the end")
		override fun navBarLayerIsVisibleAtStartAndEnd() { }
		override fun navBarLayerIsVisibleAtStartAndEnd() {
		}

		/** {@inheritDoc} */
		@Test
		@Ignore("Not applicable to this CUJ. Display starts off and app is full screen at the end")
		override fun taskBarWindowIsAlwaysVisible() { }
		override fun taskBarWindowIsAlwaysVisible() {
		}

		/** {@inheritDoc} */
		@Test
		@Ignore("Not applicable to this CUJ. Display starts off and app is full screen at the end")
		override fun navBarWindowIsAlwaysVisible() { }
		override fun navBarWindowIsAlwaysVisible() {
		}

		/** {@inheritDoc} */
		@Test
		@Ignore("Not applicable to this CUJ. Display starts off and app is full screen at the end")
		override fun statusBarWindowIsAlwaysVisible() { }
		override fun statusBarWindowIsAlwaysVisible() {
		}

		/**
		* Checks the position of the [ComponentMatcher.STATUS_BAR] at the end of the
		@@ -172,6 +178,7 @@ open class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) :
		@Postsubmit
		@Test
		fun navBarLayerIsVisibleAtEnd() {
		Assume.assumeFalse(testSpec.isTablet)
		testSpec.assertLayersEnd {
		this.isVisible(ComponentMatcher.NAV_BAR)
		}