From 62cc718bcdddafa1e6d31b4cdfab0cb633c4bf4f Mon Sep 17 00:00:00 2001
From: Vadim Tryshev <vadimt@google.com>
Date: Tue, 9 Jan 2024 14:24:15 -0800
Subject: [PATCH] Waiting for Normal state when closing Overview by touching
 outside of first task

Bug: 313926097
Flag: N/A
Test: presubmit
Change-Id: I99f54beaf94cb138eb7643e5652b88e846e81f3f
---
 tests/tapl/com/android/launcher3/tapl/BaseOverview.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/tapl/com/android/launcher3/tapl/BaseOverview.java b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java
index 2013ce4ab1..e2dcbd0413 100644
--- a/tests/tapl/com/android/launcher3/tapl/BaseOverview.java
+++ b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java
@@ -173,9 +173,12 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer {
 
             OverviewTask currentTask = flingToFirstTask();
 
-            mLauncher.touchOutsideContainer(currentTask.getUiObject(),
-                    /* tapRight= */ true,
-                    /* halfwayToEdge= */ false);
+            mLauncher.runToState(
+                    () -> mLauncher.touchOutsideContainer(currentTask.getUiObject(),
+                            /* tapRight= */ true,
+                            /* halfwayToEdge= */ false),
+                    NORMAL_STATE_ORDINAL,
+                    "touching outside of first task");
 
             return new Workspace(mLauncher);
         }