Always waiting for the drop bar to go away after an icon drag.
Should fix a test flake.
Test: affected tests
Change-Id: Icfb2a18aa625ba5435a3311d40ce30b5fdcc592e
diff --git a/tests/tapl/com/android/launcher3/tapl/Launchable.java b/tests/tapl/com/android/launcher3/tapl/Launchable.java
index 7e2c966..481281a 100644
--- a/tests/tapl/com/android/launcher3/tapl/Launchable.java
+++ b/tests/tapl/com/android/launcher3/tapl/Launchable.java
@@ -74,8 +74,11 @@
*/
public Workspace dragToWorkspace() {
final UiDevice device = mLauncher.getDevice();
- mObject.drag(new Point(
- device.getDisplayWidth() / 2, device.getDisplayHeight() / 2), DRAG_SPEED);
+ Workspace.dragIconToWorkspace(
+ mLauncher,
+ this,
+ new Point(device.getDisplayWidth() / 2, device.getDisplayHeight() / 2),
+ DRAG_SPEED);
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 587c712..e10c4fb 100644
--- a/tests/tapl/com/android/launcher3/tapl/Workspace.java
+++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java
@@ -96,7 +96,13 @@
public void ensureWorkspaceIsScrollable() {
final UiObject2 workspace = verifyActiveContainer();
if (!isWorkspaceScrollable(workspace)) {
- dragIconToNextScreen(getHotseatAppIcon("Messages"), workspace);
+ dragIconToWorkspace(
+ mLauncher,
+ getHotseatAppIcon("Messages"),
+ new Point(mLauncher.getDevice().getDisplayWidth(),
+ workspace.getVisibleBounds().centerY()),
+ ICON_DRAG_SPEED);
+ verifyActiveContainer();
}
assertTrue("Home screen workspace didn't become scrollable",
isWorkspaceScrollable(workspace));
@@ -112,12 +118,10 @@
mHotseat, AppIcon.getAppIconSelector(appName, mLauncher)));
}
- private void dragIconToNextScreen(AppIcon app, UiObject2 workspace) {
- final Point dest = new Point(
- mLauncher.getDevice().getDisplayWidth(), workspace.getVisibleBounds().centerY());
- app.getObject().drag(dest, ICON_DRAG_SPEED);
- mLauncher.waitUntilGone("drop_target_bar");
- verifyActiveContainer();
+ static void dragIconToWorkspace(LauncherInstrumentation launcher, Launchable launchable,
+ Point dest, int icon_drag_speed) {
+ launchable.getObject().drag(dest, icon_drag_speed);
+ launcher.waitUntilGone("drop_target_bar");
}
/**