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

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

Merge "Removing temporary tweaks to make tests pass in presubmit" into ub-launcher3-master

parents 1ca9c89b b0a14e96

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

+0 −5
Original line number Diff line number Diff line
@@ -95,11 +95,6 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest { 
    @Test

    @NavigationModeSwitch

    public void testStressSwipeToOverview() {

        // b/142828227

        if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess() &&

                (RUN_FLAFOR & (PLATFORM_PRESUBMIT | UNBUNDLED_PRESUBMIT)) != 0) {

            return;

        }

        for (int i = 0; i < STRESS_REPEAT_COUNT; ++i) {

            // Destroy Launcher activity.

            closeLauncherActivity();

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

+0 −5
Original line number Diff line number Diff line
@@ -177,11 +177,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 


    @Test

    public void testWorkspace() throws Exception {

        // b/142828227

        if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess() &&

                (RUN_FLAFOR & (PLATFORM_PRESUBMIT | UNBUNDLED_PRESUBMIT)) != 0) {

            return;

        }

        final Workspace workspace = mLauncher.getWorkspace();



        // Test that ensureWorkspaceIsScrollable adds a page by dragging an icon there.