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

Commit 5d8283a8 authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Making sure that we drag icon far enough to cross the threshold" into ub-launcher3-qt-dev

parents 0234edeb c026bf2f
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.graphics.Point;

import androidx.test.uiautomator.By;
import androidx.test.uiautomator.BySelector;
import androidx.test.uiautomator.UiDevice;
import androidx.test.uiautomator.UiObject2;
import androidx.test.uiautomator.Until;

@@ -70,11 +69,16 @@ abstract class Launchable {
     * Drags an object to the center of homescreen.
     */
    public Workspace dragToWorkspace() {
        final UiDevice device = mLauncher.getDevice();
        final Point launchableCenter = getObject().getVisibleCenter();
        final Point displaySize = mLauncher.getRealDisplaySize();
        final int width = displaySize.x / 2;
        Workspace.dragIconToWorkspace(
                mLauncher,
                this,
                new Point(device.getDisplayWidth() / 2, device.getDisplayHeight() / 2),
                new Point(
                        launchableCenter.x >= width ?
                                launchableCenter.x - width / 2 : launchableCenter.x + width / 2,
                        displaySize.y / 2),
                getLongPressIndicator());
        try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
                "dragged launchable to workspace")) {