diff options
author | Vadim Tryshev <vadimt@google.com> | 2019-04-05 23:51:01 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-05 23:51:01 +0000 |
commit | 9155ea4cf2d292f6008070ec4b3a24b3dee488f1 (patch) | |
tree | 803acee1a12d74cff5d94441bb5e6e7854db271e /tests | |
parent | 2945bc84b5f962f851d912c1fe78f80ad2278519 (diff) | |
parent | a6700d04d86ee6518fec816a40d0c628ab450b0c (diff) | |
download | android_packages_apps_Trebuchet-9155ea4cf2d292f6008070ec4b3a24b3dee488f1.tar.gz android_packages_apps_Trebuchet-9155ea4cf2d292f6008070ec4b3a24b3dee488f1.tar.bz2 android_packages_apps_Trebuchet-9155ea4cf2d292f6008070ec4b3a24b3dee488f1.zip |
Merge "Changing how we inject drag gesture" into ub-launcher3-master
Diffstat (limited to 'tests')
-rw-r--r-- | tests/tapl/com/android/launcher3/tapl/Launchable.java | 4 | ||||
-rw-r--r-- | tests/tapl/com/android/launcher3/tapl/Workspace.java | 19 |
2 files changed, 14 insertions, 9 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/Launchable.java b/tests/tapl/com/android/launcher3/tapl/Launchable.java index 7a2b7af5a..16ddba855 100644 --- a/tests/tapl/com/android/launcher3/tapl/Launchable.java +++ b/tests/tapl/com/android/launcher3/tapl/Launchable.java @@ -28,7 +28,6 @@ import androidx.test.uiautomator.Until; * Ancestor for AppIcon and AppMenuItem. */ class Launchable { - private static final int DRAG_SPEED = 500; protected final LauncherInstrumentation mLauncher; protected final UiObject2 mObject; @@ -77,8 +76,7 @@ class Launchable { Workspace.dragIconToWorkspace( mLauncher, this, - new Point(device.getDisplayWidth() / 2, device.getDisplayHeight() / 2), - DRAG_SPEED); + new Point(device.getDisplayWidth() / 2, device.getDisplayHeight() / 2)); try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer( "dragged launchable to workspace")) { return new Workspace(mLauncher); diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java index f04afa05f..943332e2a 100644 --- a/tests/tapl/com/android/launcher3/tapl/Workspace.java +++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java @@ -21,7 +21,9 @@ import static com.android.launcher3.TestProtocol.ALL_APPS_STATE_ORDINAL; import static junit.framework.TestCase.assertTrue; import android.graphics.Point; +import android.os.SystemClock; import android.view.KeyEvent; +import android.view.MotionEvent; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,8 +37,8 @@ import com.android.launcher3.TestProtocol; */ public final class Workspace extends Home { private static final float FLING_SPEED = 3500.0F; + private static final int DRAG_DURACTION = 2000; private final UiObject2 mHotseat; - private final int ICON_DRAG_SPEED = LauncherInstrumentation.needSlowGestures() ? 100 : 570; Workspace(LauncherInstrumentation launcher) { super(launcher); @@ -116,8 +118,7 @@ public final class Workspace extends Home { mLauncher, getHotseatAppIcon("Chrome"), new Point(mLauncher.getDevice().getDisplayWidth(), - workspace.getVisibleBounds().centerY()), - (int) (ICON_DRAG_SPEED * mLauncher.getDisplayDensity())); + workspace.getVisibleBounds().centerY())); verifyActiveContainer(); } assertTrue("Home screen workspace didn't become scrollable", @@ -134,10 +135,16 @@ public final class Workspace extends Home { mHotseat, AppIcon.getAppIconSelector(appName, mLauncher))); } - static void dragIconToWorkspace(LauncherInstrumentation launcher, Launchable launchable, - Point dest, int icon_drag_speed) { + static void dragIconToWorkspace( + LauncherInstrumentation launcher, Launchable launchable, Point dest) { LauncherInstrumentation.log("dragIconToWorkspace: begin"); - launchable.getObject().drag(dest, icon_drag_speed); + final Point launchableCenter = launchable.getObject().getVisibleCenter(); + final long downTime = SystemClock.uptimeMillis(); + launcher.sendPointer(downTime, downTime, MotionEvent.ACTION_DOWN, launchableCenter); + launcher.waitForLauncherObject("deep_shortcuts_container"); + launcher.movePointer(downTime, DRAG_DURACTION, launchableCenter, dest); + launcher.sendPointer( + downTime, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, dest); LauncherInstrumentation.log("dragIconToWorkspace: end"); launcher.waitUntilGone("drop_target_bar"); } |