diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-23 17:53:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-23 17:53:24 +0000 |
| commit | 1b9afd4f73830d0669ed5363f6b237096f2267ee (patch) | |
| tree | 83173756c36aad1485dc326431401b5fe4e4a147 /tests | |
| parent | 789fe60dc4f0f7607c8004bf1f44d4e26ff6062c (diff) | |
| parent | f5d02b069a28e759dd3484ef2e807f32fe53516f (diff) | |
| download | android_packages_apps_Trebuchet-1b9afd4f73830d0669ed5363f6b237096f2267ee.tar.gz android_packages_apps_Trebuchet-1b9afd4f73830d0669ed5363f6b237096f2267ee.tar.bz2 android_packages_apps_Trebuchet-1b9afd4f73830d0669ed5363f6b237096f2267ee.zip | |
Merge "Reading navigation_bar_gesture_height for bottom swipe region" into ub-launcher3-qt-dev
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java | 2 | ||||
| -rw-r--r-- | tests/tapl/com/android/launcher3/tapl/AllApps.java | 2 | ||||
| -rw-r--r-- | tests/tapl/com/android/launcher3/tapl/Widgets.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index 92bc77fac..a19857c78 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -242,7 +242,7 @@ public abstract class AbstractLauncherUiTest { */ protected UiObject2 scrollAndFind(UiObject2 container, BySelector condition) { final int margin = ResourceUtils.getNavbarSize( - ResourceUtils.NAVBAR_PORTRAIT_BOTTOM_SIZE, mLauncher.getResources()) + 1; + ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, mLauncher.getResources()) + 1; container.setGestureMargins(0, 0, 0, margin); int i = 0; diff --git a/tests/tapl/com/android/launcher3/tapl/AllApps.java b/tests/tapl/com/android/launcher3/tapl/AllApps.java index 70405fed8..b2043cb5a 100644 --- a/tests/tapl/com/android/launcher3/tapl/AllApps.java +++ b/tests/tapl/com/android/launcher3/tapl/AllApps.java @@ -97,7 +97,7 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer { 0, getSearchBox(allAppsContainer).getVisibleBounds().bottom + 1, 0, - ResourceUtils.getNavbarSize(ResourceUtils.NAVBAR_PORTRAIT_BOTTOM_SIZE, + ResourceUtils.getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, mLauncher.getResources()) + 1); final BySelector appIconSelector = AppIcon.getAppIconSelector(appName, mLauncher); if (!hasClickableIcon(allAppsContainer, appListRecycler, appIconSelector)) { diff --git a/tests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java index b780df4ad..94003be91 100644 --- a/tests/tapl/com/android/launcher3/tapl/Widgets.java +++ b/tests/tapl/com/android/launcher3/tapl/Widgets.java @@ -41,7 +41,7 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer { LauncherInstrumentation.log("Widgets.flingForward enter"); final UiObject2 widgetsContainer = verifyActiveContainer(); widgetsContainer.setGestureMargins(0, 0, 0, - ResourceUtils.getNavbarSize(ResourceUtils.NAVBAR_PORTRAIT_BOTTOM_SIZE, + ResourceUtils.getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, mLauncher.getResources()) + 1); widgetsContainer.fling(Direction.DOWN, (int) (FLING_SPEED * mLauncher.getDisplayDensity())); |