From f7f4f4d7eda804cd29ae498c2bf5eeb8ca316ca1 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Tue, 25 Jan 2022 15:18:12 +0000 Subject: [PATCH] Don't start dragging widget below bottom gesture margin Bug: 215672979 Test: AddConfigWidgetTest Change-Id: I8121c0662249ec019f4f47a402f7f78655a6b930 --- tests/tapl/com/android/launcher3/tapl/Widgets.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java index 0bac2ca258..7fd68c09e9 100644 --- a/tests/tapl/com/android/launcher3/tapl/Widgets.java +++ b/tests/tapl/com/android/launcher3/tapl/Widgets.java @@ -115,6 +115,7 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer { 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 tableRows = mLauncher.getChildren(widgetsContainer); @@ -126,6 +127,9 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer { if (label == null) { continue; } + if (widget.getVisibleCenter().y >= bottomGestureStartOnScreen) { + continue; + } mLauncher.assertEquals( "View is not WidgetCell", "com.android.launcher3.widget.WidgetCell",