Merge "Adding diags to getWidget" into ub-launcher3-rvc-dev
diff --git a/tests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java
index 6f847e9..39ac645 100644
--- a/tests/tapl/com/android/launcher3/tapl/Widgets.java
+++ b/tests/tapl/com/android/launcher3/tapl/Widgets.java
@@ -91,8 +91,9 @@
}
public Widget getWidget(String labelText) {
- try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
- "getting widget " + labelText + " in widgets list")) {
+ try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
+ LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
+ "getting widget " + labelText + " in widgets list")) {
final UiObject2 widgetsContainer = verifyActiveContainer();
mLauncher.assertTrue("Widgets container didn't become scrollable",
widgetsContainer.wait(Until.scrollable(true), WAIT_TIME_MS));
@@ -119,17 +120,17 @@
maxWidth = Math.max(mLauncher.getVisibleBounds(sibling).width(), maxWidth);
}
- int visibleDelta = maxWidth - mLauncher.getVisibleBounds(widget).width();
- if (visibleDelta > 0) {
- Rect parentBounds = mLauncher.getVisibleBounds(cell);
- mLauncher.linearGesture(parentBounds.centerX() + visibleDelta
- + mLauncher.getTouchSlop(),
- parentBounds.centerY(), parentBounds.centerX(),
- parentBounds.centerY(), 10, true, GestureScope.INSIDE);
- }
-
if (mLauncher.getVisibleBounds(widget).bottom
<= displaySize.y - mLauncher.getBottomGestureSize()) {
+ int visibleDelta = maxWidth - mLauncher.getVisibleBounds(widget).width();
+ if (visibleDelta > 0) {
+ Rect parentBounds = mLauncher.getVisibleBounds(cell);
+ mLauncher.linearGesture(parentBounds.centerX() + visibleDelta
+ + mLauncher.getTouchSlop(),
+ parentBounds.centerY(), parentBounds.centerX(),
+ parentBounds.centerY(), 10, true, GestureScope.INSIDE);
+ }
+
return new Widget(mLauncher, widget);
}
}