summaryrefslogtreecommitdiffstats
path: root/tests/tapl/com/android/launcher3/tapl/Widgets.java
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2019-09-26 01:50:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-09-26 01:50:07 +0000
commit92e3cec4172af2bba4f022eec19a41e2cc9cbc53 (patch)
tree0837445b201066bf6d3b4fc3cc2b23f66086f1aa /tests/tapl/com/android/launcher3/tapl/Widgets.java
parent0e752faff408179c2f51187859050417cdb15df7 (diff)
parent7bd93b16393573f15dadc8df39760cee1d3a29dc (diff)
downloadandroid_packages_apps_Trebuchet-92e3cec4172af2bba4f022eec19a41e2cc9cbc53.tar.gz
android_packages_apps_Trebuchet-92e3cec4172af2bba4f022eec19a41e2cc9cbc53.tar.bz2
android_packages_apps_Trebuchet-92e3cec4172af2bba4f022eec19a41e2cc9cbc53.zip
Merge "Reducing usage of magic constants in TAPL's widgets" into ub-launcher3-qt-qpr1-dev
Diffstat (limited to 'tests/tapl/com/android/launcher3/tapl/Widgets.java')
-rw-r--r--tests/tapl/com/android/launcher3/tapl/Widgets.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java
index 7d308afb9..af7d5d7cd 100644
--- a/tests/tapl/com/android/launcher3/tapl/Widgets.java
+++ b/tests/tapl/com/android/launcher3/tapl/Widgets.java
@@ -48,7 +48,12 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
"want to fling forward in widgets")) {
LauncherInstrumentation.log("Widgets.flingForward enter");
final UiObject2 widgetsContainer = verifyActiveContainer();
- mLauncher.scroll(widgetsContainer, Direction.DOWN, 1f, MARGINS, FLING_STEPS);
+ final int margin = widgetsContainer.getVisibleBounds().bottom -
+ mLauncher.getRealDisplaySize().y +
+ ResourceUtils.getNavbarSize(
+ ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, mLauncher.getResources());
+ mLauncher.scroll(
+ widgetsContainer, Direction.DOWN, 1f, new Rect(0, 0, 0, margin), FLING_STEPS);
try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer("flung forward")) {
verifyActiveContainer();
}