Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fadfe56 authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Not using unstable Messages app in tests" into ub-launcher3-master

parents 41d58f71 67d3fd57

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

+1 −1
Original line number Diff line number Diff line
@@ -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));

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

+7 −7
Original line number Diff line number Diff line
@@ -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",

tests/tapl/com/android/launcher3/tapl/Workspace.java

+3 −3
Original line number Diff line number Diff line
@@ -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()));