diff options
| author | Vadim Tryshev <vadimt@google.com> | 2019-10-03 14:33:04 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-03 14:33:04 -0700 |
| commit | 12de08a3b1c0eeab020ed41750542562b0409ff9 (patch) | |
| tree | c678b0d0ab082a4baefb2b07d2042a99634cad54 /tests | |
| parent | 1ac98548a73e6c82876433c5ab0f037c6da688cd (diff) | |
| parent | 7c09214298c54bba2071396129c364417e81b73d (diff) | |
| download | android_packages_apps_Trebuchet-12de08a3b1c0eeab020ed41750542562b0409ff9.tar.gz android_packages_apps_Trebuchet-12de08a3b1c0eeab020ed41750542562b0409ff9.tar.bz2 android_packages_apps_Trebuchet-12de08a3b1c0eeab020ed41750542562b0409ff9.zip | |
Merge "Waiting until context menu goes away after attempting to close it." into ub-launcher3-qt-qpr1-dev
am: 7c09214298
Change-Id: If209a43004a41ca682473232789810a4d1828521
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java | 6 |
1 files changed, 4 insertions, 2 deletions
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"); |