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

Commit b1d9bc56 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Wait for both window and layer to be visible and window to be pinned... 

Merge "Wait for both window and layer to be visible and window to be pinned before considering the app in pip mode" into udc-dev am: 56216f26 am: b7fffb5e

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



Change-Id: I08745325e8cf7fdf04716618b610f007fb109a0a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d021e847 b7fffb5e

tests/FlickerTests/src/com/android/server/wm/flicker/helpers/PipAppHelper.kt

+4 −1
Original line number Original line Diff line number Diff line
@@ -250,7 +250,10 @@ open class PipAppHelper(instrumentation: Instrumentation) : 
            waitConditions = arrayOf(ConditionsFactory.hasPipWindow())

            waitConditions = arrayOf(ConditionsFactory.hasPipWindow())

        )

        )





        wmHelper.StateSyncBuilder().withPipShown().waitForAndVerify()

        wmHelper.StateSyncBuilder()

            .withWindowSurfaceAppeared(this)

            .withPipShown()

            .waitForAndVerify()

    }

    }





    /** Expand the PIP window back to full screen via intent and wait until the app is visible */

    /** Expand the PIP window back to full screen via intent and wait until the app is visible */