From 785da8d60aa7e98976229e82e88b4a548123fe9c Mon Sep 17 00:00:00 2001 From: Vadim Tryshev Date: Mon, 1 Apr 2024 18:01:27 -0700 Subject: [PATCH] Restoring the full set of combinations in testDragShortcutToMultipleWorkspaceCells in presubmit Bug: 187761685 Test: presubmit Flag: N/A Change-Id: Ib345c94c79c7dda72283eb03515cd254e31e7c0b --- .../com/android/launcher3/util/TestUtil.java | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/tests/multivalentTests/src/com/android/launcher3/util/TestUtil.java b/tests/multivalentTests/src/com/android/launcher3/util/TestUtil.java index 95444ba3f2..d70ecddeed 100644 --- a/tests/multivalentTests/src/com/android/launcher3/util/TestUtil.java +++ b/tests/multivalentTests/src/com/android/launcher3/util/TestUtil.java @@ -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,20 +137,13 @@ 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), - new Point(dimensions.x - 1, 1), - new Point(dimensions.x - 1, dimensions.y - 2), - new Point(dimensions.x / 2, dimensions.y / 2) - }; - } + return new Point[]{ + new Point(0, 1), + new Point(0, dimensions.y - 2), + new Point(dimensions.x - 1, 1), + new Point(dimensions.x - 1, dimensions.y - 2), + new Point(dimensions.x / 2, dimensions.y / 2) + }; } /**