PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Merge "Restoring the full set of combinations in testDragShortcutToMultipleWorkspaceCells in presubmit" into main

Browse Source
This commit is contained in:
Vadim Tryshev
2024-04-08 23:02:42 +00:00
committed by Android (Google) Code Review
parent b8714e1f7f 785da8d60a
commit 47f192f3be
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/multivalentTests/src/com/android/launcher3/util/TestUtil.java
+7 -15
View File
@@ -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)
};
}
/**