Merge "Update PiP Flicker tests for content overlay" into udc-dev (2361fd5c) · Commits · e / os / android_frameworks_base

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

+10 −2

Original line number	Diff line number	Diff line
		@@ -74,10 +74,18 @@ open class EnterPipOnUserLeaveHintTest(flicker: FlickerTest) : EnterPipTransitio

		@Presubmit
		@Test
		override fun pipAppLayerOrOverlayAlwaysVisible() {
		override fun pipAppLayerAlwaysVisible() {
		// pip layer in gesture nav will disappear during transition
		Assume.assumeFalse(flicker.scenario.isGesturalNavigation)
		super.pipAppLayerOrOverlayAlwaysVisible()
		super.pipAppLayerAlwaysVisible()
		}

		@Presubmit
		@Test
		override fun pipOverlayLayerAppearThenDisappear() {
		// no overlay in gesture nav for non-auto enter PiP transition
		Assume.assumeFalse(flicker.scenario.isGesturalNavigation)
		super.pipOverlayLayerAppearThenDisappear()
		}

		@Presubmit

+13 −3

Original line number	Diff line number	Diff line
		@@ -43,13 +43,23 @@ abstract class EnterPipTransition(flicker: FlickerTest) : PipTransition(flicker)
		/** Checks [pipApp] layer remains visible throughout the animation */
		@Presubmit
		@Test
		open fun pipAppLayerOrOverlayAlwaysVisible() {
		open fun pipAppLayerAlwaysVisible() {
		flicker.assertLayers {
		this.isVisible(pipApp)
		}
		}

		/** Checks the content overlay appears then disappears during the animation */
		@Presubmit
		@Test
		open fun pipOverlayLayerAppearThenDisappear() {
		val overlay = ComponentNameMatcher.PIP_CONTENT_OVERLAY
		flicker.assertLayers {
		this.notContains(overlay)
		.then()
		.isVisible(ComponentNameMatcher.PIP_CONTENT_OVERLAY)
		.contains(overlay)
		.then()
		.isVisible(pipApp)
		.notContains(overlay)
		}
		}