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

Commit 09334492 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Update PiP Flicker tests for content overlay" into udc-dev am: 2361fd5c 

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



Change-Id: I3a89ac0fed0fc62d4e1000055119d094836dd3e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ebc1b69a 2361fd5c

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

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

+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)

        }

    }