Merge "Waiting for the state to settle after clear-all-tasks action" into main (132e6a64) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -298,7 +298,6 @@ public class FallbackRecentsTest {

		// Test dismissing all tasks.
		pressHomeAndGoToOverview().dismissAllTasks();
		waitForRecentsActivityStop(); // dismissAllTasks() will close Recents
		assertTrue("Fallback Launcher not visible", TestHelpers.wait(Until.hasObject(By.pkg(
		mOtherLauncherActivity.packageName).text(FALLBACK_LAUNCHER_TITLE)), WAIT_TIME_MS));
		}

+13 −2

Original line number	Diff line number	Diff line
		@@ -140,8 +140,19 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer {
		flingForwardImpl();
		}

		mLauncher.clickLauncherObject(
		mLauncher.waitForObjectInContainer(verifyActiveContainer(), clearAllSelector));
		final Runnable clickClearAll = () -> mLauncher.clickLauncherObject(
		mLauncher.waitForObjectInContainer(verifyActiveContainer(),
		clearAllSelector));
		if (mLauncher.is3PLauncher()) {
		mLauncher.executeAndWaitForLauncherStop(
		clickClearAll,
		"clicking 'Clear All'");
		} else {
		mLauncher.runToState(
		clickClearAll,
		NORMAL_STATE_ORDINAL,
		"clicking 'Clear All'");
		}

		mLauncher.waitUntilLauncherObjectGone(clearAllSelector);
		}