summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2019-04-30 00:59:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-04-30 00:59:45 +0000
commitb93786dca3bafde1e61bf368c0a4e03c5963e050 (patch)
tree50dc9ce9c49561dbbd0926dffa1ceef2880cf628
parent40689ca9ab919f5edc4e0f0f6fe39b11a5945d2a (diff)
parentdc5b2fbdbedc048a59eb998522ae4a7c61e52c58 (diff)
downloadandroid_packages_apps_Trebuchet-b93786dca3bafde1e61bf368c0a4e03c5963e050.tar.gz
android_packages_apps_Trebuchet-b93786dca3bafde1e61bf368c0a4e03c5963e050.tar.bz2
android_packages_apps_Trebuchet-b93786dca3bafde1e61bf368c0a4e03c5963e050.zip
Merge "Slowing down gestures for virtual device" into ub-launcher3-qt-dev
-rw-r--r--tests/tapl/com/android/launcher3/tapl/BaseOverview.java2
-rw-r--r--tests/tapl/com/android/launcher3/tapl/Workspace.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/BaseOverview.java b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java
index 74a17ce34..70d8cf7ab 100644
--- a/tests/tapl/com/android/launcher3/tapl/BaseOverview.java
+++ b/tests/tapl/com/android/launcher3/tapl/BaseOverview.java
@@ -28,7 +28,7 @@ import java.util.List;
* Common overview pane for both Launcher and fallback recents
*/
public class BaseOverview extends LauncherInstrumentation.VisibleContainer {
- private static final int FLING_SPEED = 1500;
+ private static final int FLING_SPEED = LauncherInstrumentation.needSlowGestures() ? 500 : 1500;
private static final int FLINGS_FOR_DISMISS_LIMIT = 40;
BaseOverview(LauncherInstrumentation launcher) {
diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java
index 0b3bbd223..85e112af3 100644
--- a/tests/tapl/com/android/launcher3/tapl/Workspace.java
+++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java
@@ -36,7 +36,8 @@ import com.android.launcher3.TestProtocol;
* Operations on the workspace screen.
*/
public final class Workspace extends Home {
- private static final float FLING_SPEED = 3500.0F;
+ private static final float FLING_SPEED =
+ LauncherInstrumentation.needSlowGestures() ? 1500.0F : 3500.0F;
private static final int DRAG_DURACTION = 2000;
private final UiObject2 mHotseat;