From 8ecf1b3dd3f944cc2488151111deed7f37fb81f6 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Tue, 1 Oct 2019 18:28:46 -0700
Subject: Waiting until context menu goes away after attempting to close it.

Bug: 141770616
Change-Id: I528072e830627d825906ce7c1e3dbb914e2c814e
---
 tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 52971d92f..ca15a3cf8 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -550,8 +550,10 @@ public final class LauncherInstrumentation {
                         displaySize.x / 2, displaySize.y - 1,
                         displaySize.x / 2, 0,
                         ZERO_BUTTON_STEPS_FROM_BACKGROUND_TO_HOME);
-                assertTrue("Context menu is still visible after swiping up to home",
-                        !hasLauncherObject("deep_shortcuts_container"));
+                try (LauncherInstrumentation.Closable c = addContextLayer(
+                        "Swiped up from context menu to home")) {
+                    waitUntilGone("deep_shortcuts_container");
+                }
             }
             if (hasLauncherObject(WORKSPACE_RES_ID)) {
                 log(action = "already at home");
-- 
cgit v1.2.3