From 8dac9bef07d27cc7e2e6c4f1680957328f9c1af1 Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Mon, 26 Sep 2022 16:09:38 +0000 Subject: Make sure we wait for PiP to expand Fixes: 249052100 Test: atest com.android.wm.shell.flicker.pip.ExpandPipOnDoubleClickTest Change-Id: If1b1d70dee9bc996ac04340fa2ab1a6eec0ddf67 --- .../com/android/server/wm/flicker/helpers/PipAppHelper.kt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/PipAppHelper.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/PipAppHelper.kt index 4d801c9032cb..8d4da8a013cf 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/PipAppHelper.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/helpers/PipAppHelper.kt @@ -24,6 +24,7 @@ import androidx.test.uiautomator.Until import com.android.server.wm.flicker.testapp.ActivityOptions import com.android.server.wm.traces.common.Rect import com.android.server.wm.traces.common.WindowManagerConditionsFactory +import com.android.server.wm.traces.common.region.Region import com.android.server.wm.traces.parser.toFlickerComponent import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper @@ -178,6 +179,20 @@ open class PipAppHelper(instrumentation: Instrumentation) : StandardAppHelper( wmHelper.StateSyncBuilder() .withAppTransitionIdle() .waitForAndVerify() + waitForPipWindowToExpandFrom(wmHelper, Region.from(windowRect)) + } + + private fun waitForPipWindowToExpandFrom( + wmHelper: WindowManagerStateHelper, + windowRect: Region + ) { + wmHelper.StateSyncBuilder().add("pipWindowExpanded") { + val pipAppWindow = it.wmState.visibleWindows.firstOrNull { window -> + this.windowMatchesAnyOf(window) + } ?: return@add false + val pipRegion = pipAppWindow.frameRegion + return@add pipRegion.coversMoreThan(windowRect) + }.waitForAndVerify() } companion object { -- cgit v1.2.3-59-g8ed1b