diff --git a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java index 3e84a76695..3bd372251f 100644 --- a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java +++ b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java @@ -48,7 +48,7 @@ public class DigitalWellBeingToastTest extends AbstractQuickStepTest { Duration.ofSeconds(600), Duration.ofSeconds(300), PendingIntent.getActivity(mTargetContext, -1, new Intent(), 0))); - mLauncher.pressHome(); + mLauncher.goHome(); final DigitalWellBeingToast toast = getToast(); waitForLauncherCondition("Toast is not visible", launcher -> toast.hasLimit()); @@ -58,7 +58,7 @@ public class DigitalWellBeingToastTest extends AbstractQuickStepTest { runWithShellPermission( () -> usageStatsManager.unregisterAppUsageLimitObserver(observerId)); - mLauncher.pressHome(); + mLauncher.goHome(); assertFalse("Toast is visible", getToast().hasLimit()); } finally { runWithShellPermission( diff --git a/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java b/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java index 535196329c..6ec62695af 100644 --- a/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java +++ b/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java @@ -41,7 +41,7 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest { super.setUp(); TaplTestsLauncher3.initialize(this); // b/143488140 - mLauncher.pressHome(); + mLauncher.goHome(); // Start an activity where the gestures start. startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR)); } @@ -54,7 +54,7 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest { // The test action. eventProcessor.startIteration(); - mLauncher.pressHome(); + mLauncher.goHome(); eventProcessor.finishIteration(); } @@ -66,7 +66,7 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest { closeLauncherActivity(); // The test action. - mLauncher.pressHome(); + mLauncher.goHome(); } } @@ -81,6 +81,6 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest { mLauncher.getLaunchedAppState().switchToOverview(); } closeLauncherActivity(); - mLauncher.pressHome(); + mLauncher.goHome(); } } diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java index 396cb1b79c..399cd10855 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java @@ -102,7 +102,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { public void testOverview() throws Exception { startTestAppsWithCheck(); // mLauncher.pressHome() also tests an important case of pressing home while in background. - Overview overview = mLauncher.pressHome().switchToOverview(); + Overview overview = mLauncher.goHome().switchToOverview(); assertTrue("Launcher internal state didn't switch to Overview", isInState(() -> LauncherState.OVERVIEW)); executeOnLauncher( @@ -127,7 +127,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { getCurrentOverviewPage(launcher) < currentTaskAfterFlingForward)); // Test opening a task. - OverviewTask task = mLauncher.pressHome().switchToOverview().getCurrentTask(); + OverviewTask task = mLauncher.goHome().switchToOverview().getCurrentTask(); assertNotNull("overview.getCurrentTask() returned null (1)", task); assertNotNull("OverviewTask.open returned null", task.open()); assertTrue("Test activity didn't open from Overview", mDevice.wait(Until.hasObject( @@ -139,7 +139,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { isInLaunchedApp(launcher))); // Test dismissing a task. - overview = mLauncher.pressHome().switchToOverview(); + overview = mLauncher.goHome().switchToOverview(); assertTrue("Launcher internal state didn't switch to Overview", isInState(() -> LauncherState.OVERVIEW)); final Integer numTasks = getFromLauncher(launcher -> getTaskCount(launcher)); @@ -151,7 +151,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { numTasks - 1, getTaskCount(launcher))); // Test dismissing all tasks. - mLauncher.pressHome().switchToOverview().dismissAllTasks(); + mLauncher.goHome().switchToOverview().dismissAllTasks(); assertTrue("Launcher internal state is not Home", isInState(() -> LauncherState.NORMAL)); executeOnLauncher( @@ -168,14 +168,14 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { @ScreenRecord // b/195673272 public void testOverviewActions() throws Exception { // Experimenting for b/165029151: - final Overview overview = mLauncher.pressHome().switchToOverview(); + final Overview overview = mLauncher.goHome().switchToOverview(); if (overview.hasTasks()) overview.dismissAllTasks(); - mLauncher.pressHome(); + mLauncher.goHome(); // startTestAppsWithCheck(); OverviewActions actionsView = - mLauncher.pressHome().switchToOverview().getOverviewActions(); + mLauncher.goHome().switchToOverview().getOverviewActions(); actionsView.clickAndDismissScreenshot(); } @@ -200,7 +200,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { @PortraitLandscape public void testSwitchToOverview() throws Exception { assertNotNull("Workspace.switchToOverview() returned null", - mLauncher.pressHome().switchToOverview()); + mLauncher.goHome().switchToOverview()); assertTrue("Launcher internal state didn't switch to Overview", isInState(() -> LauncherState.OVERVIEW)); } @@ -240,7 +240,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { // Testing pressHome. assertTrue("Launcher internal state is not All Apps", isInState(() -> LauncherState.ALL_APPS)); - assertNotNull("pressHome returned null", mLauncher.pressHome()); + assertNotNull("pressHome returned null", mLauncher.goHome()); assertTrue("Launcher internal state is not Home", isInState(() -> LauncherState.NORMAL)); assertNotNull("getHome returned null", mLauncher.getWorkspace()); @@ -289,7 +289,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { @PortraitLandscape public void testQuickSwitchFromHome() throws Exception { startTestActivity(2); - mLauncher.pressHome().quickSwitchToPreviousApp(); + mLauncher.goHome().quickSwitchToPreviousApp(); assertTrue("The most recent task is not running after quick switching from home", isTestActivityRunning(2)); getAndAssertLaunchedApp(); @@ -329,7 +329,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { startTestActivity(i); } - Overview overview = mLauncher.pressHome().switchToOverview(); + Overview overview = mLauncher.goHome().switchToOverview(); executeOnLauncher( launcher -> assertTrue("Don't have at least 13 tasks", getTaskCount(launcher) >= 13)); @@ -348,7 +348,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { DEFAULT_UI_TIMEOUT)); // Scroll the task offscreen as it is now first - overview = mLauncher.pressHome().switchToOverview(); + overview = mLauncher.goHome().switchToOverview(); overview.scrollCurrentTaskOffScreen(); assertTrue("Launcher internal state is not Overview", isInState(() -> LauncherState.OVERVIEW)); @@ -377,7 +377,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { launcher)) <= 1))); // Test dismissing all tasks. - mLauncher.pressHome().switchToOverview().dismissAllTasks(); + mLauncher.goHome().switchToOverview().dismissAllTasks(); assertTrue("Launcher internal state is not Home", isInState(() -> LauncherState.NORMAL)); executeOnLauncher( diff --git a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java b/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java index 661beda41c..7e408a8587 100644 --- a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java +++ b/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java @@ -197,7 +197,7 @@ public class ViewInflationDuringSwipeUp extends AbstractQuickStepTest { addItemToScreen(item); assertTrue("Widget is not present", - mLauncher.pressHome().tryGetWidget(info.label, DEFAULT_UI_TIMEOUT) != null); + mLauncher.goHome().tryGetWidget(info.label, DEFAULT_UI_TIMEOUT) != null); int widgetId = item.appWidgetId; // Verify widget id @@ -221,7 +221,7 @@ public class ViewInflationDuringSwipeUp extends AbstractQuickStepTest { // Widget is updated when going home mInitTracker.disableLog(); - mLauncher.pressHome(); + mLauncher.goHome(); verifyWidget(finalWidgetText); assertNotEquals(1, mInitTracker.viewInitCount); } finally { diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java index 61ec8bd9c5..73e9823229 100644 --- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java +++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java @@ -109,7 +109,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { launcher -> assertNotNull("Launcher internal state didn't switch to Showing Menu", launcher.getOptionsPopup())); // Check that pressHome works when the menu is shown. - mLauncher.pressHome(); + mLauncher.goHome(); } @Test @@ -121,7 +121,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { } finally { allApps.unfreeze(); } - mLauncher.pressHome(); + mLauncher.goHome(); } public static void runAllAppsTest(AbstractLauncherUiTest test, AllApps allApps) { @@ -273,7 +273,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { executeOnLauncher(launcher -> assertTrue("Flinging backward didn't scroll widgets", getWidgetsScroll(launcher) < flingForwardY)); - mLauncher.pressHome(); + mLauncher.goHome(); waitForLauncherCondition("Widgets were not closed", launcher -> getWidgetsView(launcher) == null); } diff --git a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java index 0c1f0cd255..9fb52fc9a2 100644 --- a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java +++ b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java @@ -169,7 +169,7 @@ public class RequestPinItemTest extends AbstractLauncherUiTest { } // Go back to home - mLauncher.pressHome(); + mLauncher.goHome(); Wait.atMost("", new ItemSearchCondition(itemMatcher), DEFAULT_ACTIVITY_TIMEOUT, mLauncher); } diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index bbfbc550d0..bce1879e0c 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -844,11 +844,22 @@ public final class LauncherInstrumentation { } /** + * @deprecated use goHome(). * Presses nav bar home button. * * @return the Workspace object. */ + @Deprecated public Workspace pressHome() { + return goHome(); + } + + /** + * Presses nav bar home button. + * + * @return the Workspace object. + */ + public Workspace goHome() { try (LauncherInstrumentation.Closable e = eventsCheck(); LauncherInstrumentation.Closable c = addContextLayer("want to switch to home")) { waitForLauncherInitialized();