Merge "Revert "Prevent dragging widgets to another page in tests when starting... (09a98dfd) · Commits · e / os / BlissLauncher3

tests/src/com/android/launcher3/celllayout/ReorderWidgets.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import com.android.launcher3.tapl.Widget;
		import com.android.launcher3.tapl.WidgetResizeFrame;
		import com.android.launcher3.ui.AbstractLauncherUiTest;
		import com.android.launcher3.ui.TaplTestsLauncher3;
		import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;
		import com.android.launcher3.util.rule.ShellCommandRule;
		import com.android.launcher3.views.DoubleShadowBubbleTextView;
		import com.android.launcher3.widget.LauncherAppWidgetHostView;
		@@ -145,22 +146,26 @@ public class ReorderWidgets extends AbstractLauncherUiTest {
		runTestCase(testCaseMap.get(iconGridDimensions));
		}

		@ScreenRecord // b/242323136
		@Test
		public void simpleReorder() throws ExecutionException, InterruptedException {
		runTestCaseMap(SimpleReorderCase.TEST_BY_GRID_SIZE,
		SimpleReorderCase.class.getSimpleName());
		}

		@ScreenRecord // b/242323136
		@Test
		public void pushTest() throws ExecutionException, InterruptedException {
		runTestCaseMap(PushReorderCase.TEST_BY_GRID_SIZE, PushReorderCase.class.getSimpleName());
		}

		@ScreenRecord // b/242323136
		@Test
		public void fullReorder() throws ExecutionException, InterruptedException {
		runTestCaseMap(FullReorderCase.TEST_BY_GRID_SIZE, FullReorderCase.class.getSimpleName());
		}

		@ScreenRecord // b/242323136
		@Test
		public void moveOutReorder() throws ExecutionException, InterruptedException {
		runTestCaseMap(MoveOutReorderCase.TEST_BY_GRID_SIZE,

+3 −4

Original line number	Diff line number	Diff line
		@@ -85,10 +85,9 @@ public abstract class Launchable {
		}

		Point startDrag(long downTime, Runnable expectLongClickEvents, boolean runToSpringLoadedState) {
		Point iconCenter = getObject().getVisibleCenter();
		final Point displaySize = mLauncher.getRealDisplaySize();
		final Point dragStartCenter = new Point(displaySize.x / 2,
		displaySize.y / 2 - getStartDragThreshold());
		final Point iconCenter = getObject().getVisibleCenter();
		final Point dragStartCenter = new Point(iconCenter.x,
		iconCenter.y - getStartDragThreshold());

		if (runToSpringLoadedState) {
		mLauncher.runToState(() -> movePointerForStartDrag(