| commit | 8dca8a73287779cf876e567f10579b94529cebdf | [log] [tgz] |
|---|---|---|
| author | vadimt <vadimt@google.com> | Mon Apr 29 16:01:47 2019 -0700 |
| committer | vadimt <vadimt@google.com> | Mon Apr 29 16:01:47 2019 -0700 |
| tree | 10a30eefc35f5553a386a0a43125ad977d206856 | |
| parent | dd165d2d7cac289df4de379cc8bad98d60773cc0 [diff] |
Not switching nav mode on a virtual device for now Change-Id: Ie089638b6252073e5e495e87c7bc0d252a58e95f
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index 3e84440..dedc6b3 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -111,7 +111,7 @@ 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 27bc43e..f5c5a8d 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -191,7 +191,7 @@ return NavigationModel.THREE_BUTTON; } - static boolean needSlowGestures() { + public static boolean needSlowGestures() { return Build.MODEL.contains("Cuttlefish"); }