Merge "Adding diags to getWidget" into ub-launcher3-rvc-dev am: e8fade9140 (a404566d) · Commits · e / os / android_packages_apps_Trebuchet

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

+12 −11

Original line number	Diff line number	Diff line
		@@ -91,7 +91,8 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
		}

		public Widget getWidget(String labelText) {
		try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
		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",
		@@ -119,6 +120,8 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
		maxWidth = Math.max(mLauncher.getVisibleBounds(sibling).width(), maxWidth);
		}

		if (mLauncher.getVisibleBounds(widget).bottom
		<= displaySize.y - mLauncher.getBottomGestureSize()) {
		int visibleDelta = maxWidth - mLauncher.getVisibleBounds(widget).width();
		if (visibleDelta > 0) {
		Rect parentBounds = mLauncher.getVisibleBounds(cell);
		@@ -128,8 +131,6 @@ public final class Widgets extends LauncherInstrumentation.VisibleContainer {
		parentBounds.centerY(), 10, true, GestureScope.INSIDE);
		}

		if (mLauncher.getVisibleBounds(widget).bottom
		<= displaySize.y - mLauncher.getBottomGestureSize()) {
		return new Widget(mLauncher, widget);
		}
		}