commit cb15a24cfe4c5d9efd7b690b6be41e032a46f08d
author Vadim Tryshev <vadimt@google.com> Wed Mar 27 22:56:57 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 27 22:56:57 2019 +0000
tree 59f3d59f1ff656a29013c88100224e9a9091ae56
parent 8e8c46069c3f014694b59bbeb49105e085c5e59c
parent f78f47ddeff057cb5256bbbcd05fb976f7abecbd

Merge "TAPL: Not starting all apps scroll gestures over nav bar" into ub-launcher3-master

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

diff --git a/tests/tapl/com/android/launcher3/tapl/AllApps.java b/tests/tapl/com/android/launcher3/tapl/AllApps.java
index b785007..e4dced5 100644
--- a/tests/tapl/com/android/launcher3/tapl/AllApps.java
+++ b/tests/tapl/com/android/launcher3/tapl/AllApps.java
@@ -63,6 +63,8 @@
         try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
                 "want to get app icon on all apps")) {
             final UiObject2 allAppsContainer = verifyActiveContainer();
+            final UiObject2 navBar = mLauncher.waitForSystemUiObject("navigation_bar_frame");
+            allAppsContainer.setGestureMargins(0, 0, 0, navBar.getVisibleBounds().height());
             final BySelector appIconSelector = AppIcon.getAppIconSelector(appName, mLauncher);
             if (!hasClickableIcon(allAppsContainer, appIconSelector)) {
                 scrollBackToBeginning();