diff options
| author | Vadim Tryshev <vadimt@google.com> | 2019-09-24 18:18:19 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-24 18:18:19 -0700 |
| commit | ec1ae481d47fa6e7558e9f80e84633312eb7fe78 (patch) | |
| tree | 2113800c20fae750bbf5350faade17097d436490 | |
| parent | ffa00614b4fa69644785f8e32a40f599596f65d3 (diff) | |
| parent | 6929199c8a568bc32a5a423680fc008ef499a1d5 (diff) | |
| download | android_packages_apps_Trebuchet-ec1ae481d47fa6e7558e9f80e84633312eb7fe78.tar.gz android_packages_apps_Trebuchet-ec1ae481d47fa6e7558e9f80e84633312eb7fe78.tar.bz2 android_packages_apps_Trebuchet-ec1ae481d47fa6e7558e9f80e84633312eb7fe78.zip | |
Merge "Removing temporary checks that tests are running on AVD" into ub-launcher3-qt-qpr1-dev
am: 6929199c8a
Change-Id: Iaa6200f0371a4deca630194ac8ecfcfc04313750
| -rw-r--r-- | quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java | 5 | ||||
| -rw-r--r-- | tests/tapl/com/android/launcher3/tapl/Workspace.java | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java b/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java index c5b560c3f..2111e2ca2 100644 --- a/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java +++ b/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java @@ -25,7 +25,6 @@ import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.Launcher; -import com.android.launcher3.tapl.LauncherInstrumentation; import com.android.launcher3.util.RaceConditionReproducer; import com.android.quickstep.NavigationModeSwitchRule.Mode; import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch; @@ -80,8 +79,6 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest { @Test @NavigationModeSwitch public void testStressPressHome() { - if (LauncherInstrumentation.isAvd()) return; // b/136278866 - for (int i = 0; i < STRESS_REPEAT_COUNT; ++i) { // Destroy Launcher activity. closeLauncherActivity(); @@ -94,8 +91,6 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest { @Test @NavigationModeSwitch public void testStressSwipeToOverview() { - if (LauncherInstrumentation.isAvd()) return; // b/136278866 - for (int i = 0; i < STRESS_REPEAT_COUNT; ++i) { // Destroy Launcher activity. closeLauncherActivity(); diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java index d556afc9b..fe27e71f5 100644 --- a/tests/tapl/com/android/launcher3/tapl/Workspace.java +++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java @@ -39,8 +39,6 @@ import com.android.launcher3.testing.TestProtocol; * Operations on the workspace screen. */ public final class Workspace extends Home { - private static final float FLING_SPEED = - LauncherInstrumentation.isAvd() ? 1500.0F : 3500.0F; private static final int DRAG_DURACTION = 2000; private static final int FLING_STEPS = 10; private final UiObject2 mHotseat; |