diff options
3 files changed, 11 insertions, 11 deletions
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java index 6623861fc..4112ccf71 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java @@ -60,7 +60,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { } private void startTestApps() throws Exception { - startAppFast(resolveSystemApp(Intent.CATEGORY_APP_MESSAGING)); + startAppFast(resolveSystemApp(Intent.CATEGORY_APP_MARKET)); startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR)); startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CONTACTS)); diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java index 91ebd9bea..d29d29c2d 100644 --- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java +++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java @@ -207,8 +207,8 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { // Test that ensureWorkspaceIsScrollable adds a page by dragging an icon there. executeOnLauncher(launcher -> assertFalse("Initial workspace state is scrollable", isWorkspaceScrollable(launcher))); - assertNull("Messages app was found on empty workspace", - workspace.tryGetWorkspaceAppIcon("Messages")); + assertNull("Play Store app was found on empty workspace", + workspace.tryGetWorkspaceAppIcon("Play Store")); workspace.ensureWorkspaceIsScrollable(); @@ -218,8 +218,8 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { executeOnLauncher( launcher -> assertTrue("ensureScrollable didn't make workspace scrollable", isWorkspaceScrollable(launcher))); - assertNotNull("ensureScrollable didn't add Messages app", - workspace.tryGetWorkspaceAppIcon("Messages")); + assertNotNull("ensureScrollable didn't add Play Store app", + workspace.tryGetWorkspaceAppIcon("Play Store")); // Test flinging workspace. workspace.flingBackward(); @@ -235,10 +235,10 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { assertTrue("Launcher internal state is not Home", isInState(LauncherState.NORMAL)); // Test starting a workspace app. - final AppIcon app = workspace.tryGetWorkspaceAppIcon("Messages"); - assertNotNull("No Messages app in workspace", app); + final AppIcon app = workspace.tryGetWorkspaceAppIcon("Play Store"); + assertNotNull("No Play Store app in workspace", app); assertNotNull("AppIcon.launch returned null", - app.launch(resolveSystemApp(Intent.CATEGORY_APP_MESSAGING))); + app.launch(resolveSystemApp(Intent.CATEGORY_APP_MARKET))); executeOnLauncher(launcher -> assertTrue( "Launcher activity is the top activity; expecting another activity to be the top " + "one", diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java index 22b556466..91443d0a0 100644 --- a/tests/tapl/com/android/launcher3/tapl/Workspace.java +++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java @@ -50,8 +50,8 @@ public final class Workspace extends Home { */ @NonNull public AllApps switchToAllApps() { - try(LauncherInstrumentation.Closable c = - mLauncher.addContextLayer("want to switch from workspace to all apps")) { + try (LauncherInstrumentation.Closable c = + mLauncher.addContextLayer("want to switch from workspace to all apps")) { verifyActiveContainer(); final UiObject2 hotseat = mHotseat; final Point start = hotseat.getVisibleCenter(); @@ -114,7 +114,7 @@ public final class Workspace extends Home { if (!isWorkspaceScrollable(workspace)) { dragIconToWorkspace( mLauncher, - getHotseatAppIcon("Messages"), + getHotseatAppIcon("Play Store"), new Point(mLauncher.getDevice().getDisplayWidth(), workspace.getVisibleBounds().centerY()), (int) (ICON_DRAG_SPEED * mLauncher.getDisplayDensity())); |