commit 12de08a3b1c0eeab020ed41750542562b0409ff9
author Vadim Tryshev <vadimt@google.com> Thu Oct 03 14:33:04 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 03 14:33:04 2019 -0700
tree c678b0d0ab082a4baefb2b07d2042a99634cad54
parent 1ac98548a73e6c82876433c5ab0f037c6da688cd
parent 7c09214298c54bba2071396129c364417e81b73d

Merge "Waiting until context menu goes away after attempting to close it." into ub-launcher3-qt-qpr1-dev
am: 7c09214298

Change-Id: If209a43004a41ca682473232789810a4d1828521

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 52971d9..ca15a3c 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -550,8 +550,10 @@
                         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");