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

Commit 785da8d6 authored by Vadim Tryshev's avatar Vadim Tryshev
Browse files

Restoring the full set of combinations in testDragShortcutToMultipleWorkspaceCells in presubmit 

Bug: 187761685
Test: presubmit
Flag: N/A
Change-Id: Ib345c94c79c7dda72283eb03515cd254e31e7c0b
parent ee7a0694

tests/multivalentTests/src/com/android/launcher3/util/TestUtil.java

+7 −15
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ import com.android.launcher3.config.FeatureFlags.BooleanFlag; 
import com.android.launcher3.config.FeatureFlags.IntFlag;

import com.android.launcher3.tapl.LauncherInstrumentation;

import com.android.launcher3.tapl.Workspace;

import com.android.launcher3.util.rule.TestStabilityRule;



import org.junit.Assert;
@@ -138,12 +137,6 @@ public class TestUtil { 
     */

    public static Point[] getCornersAndCenterPositions(LauncherInstrumentation launcher) {

        final Point dimensions = launcher.getWorkspace().getIconGridDimensions();

        if (TestStabilityRule.isPresubmit()) {

            // Return only center in presubmit to fit under the presubmit SLO.

            return new Point[]{

                    new Point(dimensions.x / 2, dimensions.y / 2)

            };

        } else {

        return new Point[]{

                new Point(0, 1),

                new Point(0, dimensions.y - 2),
@@ -152,7 +145,6 @@ public class TestUtil { 
                new Point(dimensions.x / 2, dimensions.y / 2)

        };

    }

    }



    /**

     * Utility class to override a boolean flag during test. Note that the returned SafeCloseable