diff options
author | vadimt <vadimt@google.com> | 2019-04-29 16:01:47 -0700 |
---|---|---|
committer | vadimt <vadimt@google.com> | 2019-04-29 16:01:47 -0700 |
commit | 8dca8a73287779cf876e567f10579b94529cebdf (patch) | |
tree | 10a30eefc35f5553a386a0a43125ad977d206856 /tests | |
parent | dd165d2d7cac289df4de379cc8bad98d60773cc0 (diff) | |
download | android_packages_apps_Trebuchet-8dca8a73287779cf876e567f10579b94529cebdf.tar.gz android_packages_apps_Trebuchet-8dca8a73287779cf876e567f10579b94529cebdf.tar.bz2 android_packages_apps_Trebuchet-8dca8a73287779cf876e567f10579b94529cebdf.zip |
Not switching nav mode on a virtual device for now
Change-Id: Ie089638b6252073e5e495e87c7bc0d252a58e95f
Diffstat (limited to 'tests')
-rw-r--r-- | tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java | 2 | ||||
-rw-r--r-- | tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index 3e84440b0..dedc6b3c2 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -111,7 +111,7 @@ public abstract class AbstractLauncherUiTest { mLauncher = new LauncherInstrumentation(instrumentation); // b/130558787; b/131419978 - if (TestHelpers.isInLauncherProcess()) { + if (TestHelpers.isInLauncherProcess() && !LauncherInstrumentation.needSlowGestures()) { try { Class systemProps = Class.forName("android.os.SystemProperties"); Method getInt = systemProps.getMethod("getInt", String.class, int.class); diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 27bc43ef9..f5c5a8d0b 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -191,7 +191,7 @@ public final class LauncherInstrumentation { return NavigationModel.THREE_BUTTON; } - static boolean needSlowGestures() { + public static boolean needSlowGestures() { return Build.MODEL.contains("Cuttlefish"); } |