commit 48fb939966ce3cd82dbed6b13d223dbdd89dc041
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 25 18:47:18 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 25 18:47:18 2022 +0000
tree d8a3e81a42294c981584ed26b7a0c2793ebc93b8
parent 454fbb35ddcacab9102da3857ddd57f701a799a0
parent f7f4f4d7eda804cd29ae498c2bf5eeb8ca316ca1

Merge "Don't start dragging widget below bottom gesture margin"

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

diff --git a/tests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java
index 0bac2ca..7fd68c0 100644
--- a/tests/tapl/com/android/launcher3/tapl/Widgets.java
+++ b/tests/tapl/com/android/launcher3/tapl/Widgets.java
@@ -115,6 +115,7 @@
             final BySelector labelSelector = By.clazz("android.widget.TextView").text(labelText);
             final BySelector previewSelector = By.res(mLauncher.getLauncherPackageName(),
                     "widget_preview");
+            final int bottomGestureStartOnScreen = mLauncher.getBottomGestureStartOnScreen();
             int i = 0;
             for (; ; ) {
                 final Collection<UiObject2> tableRows = mLauncher.getChildren(widgetsContainer);
@@ -126,6 +127,9 @@
                         if (label == null) {
                             continue;
                         }
+                        if (widget.getVisibleCenter().y >= bottomGestureStartOnScreen) {
+                            continue;
+                        }
                         mLauncher.assertEquals(
                                 "View is not WidgetCell",
                                 "com.android.launcher3.widget.WidgetCell",