Merge "Ensure TestLauncher is actaully shown in goToOverviewFromHome" into tm-dev am: f5f589ad52 am: d51bc65fb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17586927 Change-Id: I05b08f4178facf99dd656e2d4beb9059a92570fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -79,6 +79,8 @@ import java.util.function.Function;
|
|||||||
@RunWith(AndroidJUnit4.class)
|
@RunWith(AndroidJUnit4.class)
|
||||||
public class FallbackRecentsTest {
|
public class FallbackRecentsTest {
|
||||||
|
|
||||||
|
private static final String FALLBACK_LAUNCHER_TITLE = "Test launcher";
|
||||||
|
|
||||||
private final UiDevice mDevice;
|
private final UiDevice mDevice;
|
||||||
private final LauncherInstrumentation mLauncher;
|
private final LauncherInstrumentation mLauncher;
|
||||||
private final ActivityInfo mOtherLauncherActivity;
|
private final ActivityInfo mOtherLauncherActivity;
|
||||||
@@ -169,7 +171,7 @@ public class FallbackRecentsTest {
|
|||||||
public void goToOverviewFromHome() {
|
public void goToOverviewFromHome() {
|
||||||
mDevice.pressHome();
|
mDevice.pressHome();
|
||||||
assertTrue("Fallback Launcher not visible", mDevice.wait(Until.hasObject(By.pkg(
|
assertTrue("Fallback Launcher not visible", mDevice.wait(Until.hasObject(By.pkg(
|
||||||
mOtherLauncherActivity.packageName)), WAIT_TIME_MS));
|
mOtherLauncherActivity.packageName).text(FALLBACK_LAUNCHER_TITLE)), WAIT_TIME_MS));
|
||||||
|
|
||||||
mLauncher.getLaunchedAppState().switchToOverview();
|
mLauncher.getLaunchedAppState().switchToOverview();
|
||||||
}
|
}
|
||||||
@@ -258,7 +260,7 @@ public class FallbackRecentsTest {
|
|||||||
// Test dismissing all tasks.
|
// Test dismissing all tasks.
|
||||||
pressHomeAndGoToOverview().dismissAllTasks();
|
pressHomeAndGoToOverview().dismissAllTasks();
|
||||||
assertTrue("Fallback Launcher not visible", TestHelpers.wait(Until.hasObject(By.pkg(
|
assertTrue("Fallback Launcher not visible", TestHelpers.wait(Until.hasObject(By.pkg(
|
||||||
mOtherLauncherActivity.packageName)), WAIT_TIME_MS));
|
mOtherLauncherActivity.packageName).text(FALLBACK_LAUNCHER_TITLE)), WAIT_TIME_MS));
|
||||||
}
|
}
|
||||||
|
|
||||||
private int getCurrentOverviewPage(RecentsActivity recents) {
|
private int getCurrentOverviewPage(RecentsActivity recents) {
|
||||||
|
|||||||
Reference in New Issue
Block a user