summaryrefslogtreecommitdiffstats
path: root/tests/src/com/android
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-05-23 17:53:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-23 17:53:24 +0000
commit1b9afd4f73830d0669ed5363f6b237096f2267ee (patch)
tree83173756c36aad1485dc326431401b5fe4e4a147 /tests/src/com/android
parent789fe60dc4f0f7607c8004bf1f44d4e26ff6062c (diff)
parentf5d02b069a28e759dd3484ef2e807f32fe53516f (diff)
downloadandroid_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/src/com/android')
-rw-r--r--tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java2
1 files changed, 1 insertions, 1 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;