Merge "Partially reverting waiting for animation when setting widget result" into main (4bd8b8c6) · Commits · e / os / android_packages_apps_Trebuchet

tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java

+1 −11

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ public class AddConfigWidgetTest extends AbstractLauncherUiTest {
		// Verify that the widget id is valid and bound
		assertNotNull(mAppWidgetManager.getAppWidgetInfo(mWidgetId));

		setResultAndWaitForAnimation(acceptConfig);
		setResult(acceptConfig);
		if (acceptConfig) {
		Wait.atMost("", new WidgetSearchCondition(), DEFAULT_ACTIVITY_TIMEOUT, mLauncher);
		assertNotNull(mAppWidgetManager.getAppWidgetInfo(mWidgetId));
		@@ -117,16 +117,6 @@ public class AddConfigWidgetTest extends AbstractLauncherUiTest {
		success ? "clickOK" : "clickCancel"));
		}

		private void setResultAndWaitForAnimation(boolean success) {
		if (mLauncher.isLauncher3()) {
		setResult(success);
		} else {
		mLauncher.executeAndWaitForWallpaperAnimation(
		() -> setResult(success),
		"setting widget coinfig result");
		}
		}

		/**
		* Condition for searching widget id
		*/