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

Commit a798be2f authored by Sebastián Franco's avatar Sebastián Franco
Browse files

Revert "Prevent dragging widgets to another page in tests when starting a drag." 

This reverts commit 749b2b84.

Reason for revert: Causing tests to fail b/246972374

Change-Id: I9fc1f6d2e924f4ac5484c6674fd0adf49d04536f
parent 749b2b84

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;
@@ -140,22 +141,26 @@ public class ReorderWidgets extends AbstractLauncherUiTest { 
        runTestCase(testCaseMap.get(iconGridDimensions));

    }



    @ScreenRecord // b/242323136

    @Test

    public void simpleReorder() {

        runTestCaseMap(SimpleReorderCase.TEST_BY_GRID_SIZE,

                SimpleReorderCase.class.getSimpleName());

    }



    @ScreenRecord // b/242323136

    @Test

    public void pushTest() {

        runTestCaseMap(PushReorderCase.TEST_BY_GRID_SIZE, PushReorderCase.class.getSimpleName());

    }



    @ScreenRecord // b/242323136

    @Test

    public void fullReorder() {

        runTestCaseMap(FullReorderCase.TEST_BY_GRID_SIZE, FullReorderCase.class.getSimpleName());

    }



    @ScreenRecord // b/242323136

    @Test

    public void moveOutReorder() {

        runTestCaseMap(MoveOutReorderCase.TEST_BY_GRID_SIZE,

tests/tapl/com/android/launcher3/tapl/Launchable.java

+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(