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

Commit 6a874a58 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Switching from mDevice.pressHome() to mLauncher.pressHome()" into ub-launcher3-master

parents ce1ffc32 579c8c20

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

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ public class TaplTests extends AbstractQuickStepTest { 


        clearLauncherData();



        mDevice.pressHome();

        mLauncher.pressHome();

        waitForState("Launcher internal state didn't switch to Home", LauncherState.NORMAL);

        waitForResumed("Launcher internal state is still Background");

    }
@@ -424,7 +424,7 @@ public class TaplTests extends AbstractQuickStepTest { 
        executeOnLauncher(launcher -> assertTrue("Flinging backward didn't scroll widgets",

                getWidgetsScroll(launcher) < flingForwardY));



        mDevice.pressHome();

        mLauncher.pressHome();

        waitForLauncherCondition("Widgets were not closed",

                launcher -> getWidgetsView(launcher) == null);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ public abstract class AbstractLauncherUiTest { 
                public void evaluate() throws Throwable {

                    try {

                        // Create launcher activity if necessary and bring it to the front.

                        mDevice.pressHome();

                        mLauncher.pressHome();

                        waitForLauncherCondition("Launcher activity wasn't created",

                                launcher -> launcher != null);

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

+1 −3
Original line number Diff line number Diff line
@@ -21,14 +21,12 @@ public class AllAppsIconToHomeTest extends AbstractLauncherUiTest { 
        LauncherActivityInfo settingsApp = getSettingsApp();



        clearHomescreen();

        mDevice.pressHome();

        mDevice.waitForIdle();



        final String appName = settingsApp.getLabel().toString();

        // 1. Open all apps and wait for load complete.

        // 2. Drag icon to homescreen.

        // 3. Verify that the icon works on homescreen.

        mLauncher.getWorkspace().

        mLauncher.pressHome().

                switchToAllApps().

                getAppIcon(appName).

                dragToWorkspace().