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

am: 7c09214298 Change-Id: If209a43004a41ca682473232789810a4d1828521
2019-10-03 14:33:04 -07:00
parent 1ac98548a7 7c09214298
commit 12de08a3b1
1 changed files with 4 additions and 2 deletions
@@ -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");