diff options
author | vadimt <vadimt@google.com> | 2019-04-12 11:10:20 -0700 |
---|---|---|
committer | vadimt <vadimt@google.com> | 2019-04-12 18:19:38 -0700 |
commit | 679b09d6bd9d76f3284a29bdff6a67e5b3f696ff (patch) | |
tree | d54ba513bf223460db9ef0f0632dde9255622a4b /tests/tapl/com/android/launcher3/tapl/AllApps.java | |
parent | c6d9ddfddbc70aa1f486b3ed730111741566989f (diff) | |
download | android_packages_apps_Trebuchet-679b09d6bd9d76f3284a29bdff6a67e5b3f696ff.tar.gz android_packages_apps_Trebuchet-679b09d6bd9d76f3284a29bdff6a67e5b3f696ff.tar.bz2 android_packages_apps_Trebuchet-679b09d6bd9d76f3284a29bdff6a67e5b3f696ff.zip |
Gestures for zero-button mode
Change-Id: If17ba764ede132694ccf0c56269df1a4117ec0f6
Diffstat (limited to 'tests/tapl/com/android/launcher3/tapl/AllApps.java')
-rw-r--r-- | tests/tapl/com/android/launcher3/tapl/AllApps.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/AllApps.java b/tests/tapl/com/android/launcher3/tapl/AllApps.java index 98fb07f7f..4685c7db2 100644 --- a/tests/tapl/com/android/launcher3/tapl/AllApps.java +++ b/tests/tapl/com/android/launcher3/tapl/AllApps.java @@ -16,6 +16,8 @@ package com.android.launcher3.tapl; +import static com.android.launcher3.tapl.LauncherInstrumentation.NavigationModel.ZERO_BUTTON; + import androidx.annotation.NonNull; import androidx.test.uiautomator.BySelector; import androidx.test.uiautomator.Direction; @@ -47,6 +49,7 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer { private boolean hasClickableIcon(UiObject2 allAppsContainer, BySelector appIconSelector) { final UiObject2 icon = allAppsContainer.findObject(appIconSelector); if (icon == null) return false; + if (mLauncher.getNavigationModel() == ZERO_BUTTON) return true; final UiObject2 navBar = mLauncher.waitForSystemUiObject("navigation_bar_frame"); return icon.getVisibleBounds().bottom < navBar.getVisibleBounds().top; } @@ -63,8 +66,10 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer { 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() + 1); + if (mLauncher.getNavigationModel() != ZERO_BUTTON) { + final UiObject2 navBar = mLauncher.waitForSystemUiObject("navigation_bar_frame"); + allAppsContainer.setGestureMargins(0, 0, 0, navBar.getVisibleBounds().height() + 1); + } final BySelector appIconSelector = AppIcon.getAppIconSelector(appName, mLauncher); if (!hasClickableIcon(allAppsContainer, appIconSelector)) { scrollBackToBeginning(); |