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

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

Merge "Simplifying switching to home for some tests" into ub-launcher3-qt-r1-dev

parents acc2b335 d91cec72

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

+3 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public class AppPredictionsUITests extends AbstractQuickStepTest { 
     */

    @Test

    public void testPredictionExistsInAllApps() {

        mActivityMonitor.startLauncher();

        mDevice.pressHome();

        mLauncher.pressHome().switchToAllApps();



        // Dispatch an update
@@ -103,7 +103,7 @@ public class AppPredictionsUITests extends AbstractQuickStepTest { 
     */

    @Test

    public void testPredictionsDeferredUntilHome() {

        mActivityMonitor.startLauncher();

        mDevice.pressHome();

        sendPredictionUpdate(mSampleApp1, mSampleApp2);

        mLauncher.pressHome().switchToAllApps();

        waitForLauncherCondition("Predictions were not updated in loading state",
@@ -120,7 +120,7 @@ public class AppPredictionsUITests extends AbstractQuickStepTest { 


    @Test

    public void testPredictionsDisabled() {

        mActivityMonitor.startLauncher();

        mDevice.pressHome();

        sendPredictionUpdate();

        mLauncher.pressHome().switchToAllApps();

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

+3 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public class DefaultLayoutProviderTest extends AbstractLauncherUiTest { 
        writeLayout(new LauncherLayoutBuilder().atHotseat(0).putApp(SETTINGS_APP, SETTINGS_APP));



        // Launch the home activity

        mActivityMonitor.startLauncher();

        mDevice.pressHome();

        waitForModelLoaded();



        mLauncher.getWorkspace().getHotseatAppIcon(getSettingsApp().getLabel().toString());
@@ -88,7 +88,7 @@ public class DefaultLayoutProviderTest extends AbstractLauncherUiTest { 
                        info.getComponent().getClassName(), 2, 2));



        // Launch the home activity

        mActivityMonitor.startLauncher();

        mDevice.pressHome();

        waitForModelLoaded();



        // Verify widget present
@@ -105,7 +105,7 @@ public class DefaultLayoutProviderTest extends AbstractLauncherUiTest { 
                .build());



        // Launch the home activity

        mActivityMonitor.startLauncher();

        mDevice.pressHome();

        waitForModelLoaded();



        mLauncher.getWorkspace().getHotseatFolder("Folder: Copy");

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

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public class WorkTabTest extends AbstractLauncherUiTest { 


    @Test

    public void workTabExists() {

        mActivityMonitor.startLauncher();

        mDevice.pressHome();



        executeOnLauncher(launcher -> launcher.getStateManager().goToState(ALL_APPS));

tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class AddConfigWidgetTest extends AbstractLauncherUiTest { 
        lockRotation(true);



        clearHomescreen();

        mActivityMonitor.startLauncher();

        mDevice.pressHome();



        final Widgets widgets = mLauncher.getWorkspace().openAllWidgets();

tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public class AddWidgetTest extends AbstractLauncherUiTest { 


    private void performTest() throws Throwable {

        clearHomescreen();

        mActivityMonitor.startLauncher();

        mDevice.pressHome();



        final LauncherAppWidgetProviderInfo widgetInfo =

                TestViewHelpers.findWidgetProvider(this, false /* hasConfigureScreen */);