Merge "Slowing down workspace test fling" into ub-launcher3-master
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 444f3bd..e20a89e 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -424,4 +424,8 @@
mInstrumentation.sendPointerSync(event);
event.recycle();
}
+
+ float getDisplayDensity() {
+ return mInstrumentation.getTargetContext().getResources().getDisplayMetrics().density;
+ }
}
\ No newline at end of file
diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java
index 5e6ad4d..f055c0c 100644
--- a/tests/tapl/com/android/launcher3/tapl/Workspace.java
+++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java
@@ -30,6 +30,7 @@
* Operations on the workspace screen.
*/
public final class Workspace extends Home {
+ private static final float FLING_SPEED = 3500.0F;
private final UiObject2 mHotseat;
private final int ICON_DRAG_SPEED = 2000;
@@ -124,7 +125,7 @@
*/
public void flingForward() {
final UiObject2 workspace = verifyActiveContainer();
- workspace.fling(Direction.RIGHT);
+ workspace.fling(Direction.RIGHT, (int) (FLING_SPEED * mLauncher.getDisplayDensity()));
mLauncher.waitForIdle();
verifyActiveContainer();
}
@@ -135,7 +136,7 @@
*/
public void flingBackward() {
final UiObject2 workspace = verifyActiveContainer();
- workspace.fling(Direction.LEFT);
+ workspace.fling(Direction.LEFT, (int) (FLING_SPEED * mLauncher.getDisplayDensity()));
mLauncher.waitForIdle();
verifyActiveContainer();
}