summaryrefslogtreecommitdiffstats
path: root/quickstep/tests
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2019-05-03 17:42:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-03 17:42:20 +0000
commit2c99205461a3e752c5046a213d9b6d99315ed017 (patch)
treee57e18523799b126f399ac4d77f67f220af8d793 /quickstep/tests
parenta3c0a082f9fe84e007596646e544371fc4df277f (diff)
parentbcf0d1e08217a98830ee3838619d9802c8cc33f4 (diff)
downloadandroid_packages_apps_Trebuchet-2c99205461a3e752c5046a213d9b6d99315ed017.tar.gz
android_packages_apps_Trebuchet-2c99205461a3e752c5046a213d9b6d99315ed017.tar.bz2
android_packages_apps_Trebuchet-2c99205461a3e752c5046a213d9b6d99315ed017.zip
Merge "Reenabling switching between nav modes in tests" into ub-launcher3-qt-dev
Diffstat (limited to 'quickstep/tests')
-rw-r--r--quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java3
-rw-r--r--quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java3
2 files changed, 1 insertions, 5 deletions
diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index 960d907dc..20fdff2c5 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -44,7 +44,6 @@ import com.android.launcher3.tapl.LauncherInstrumentation;
import com.android.launcher3.testcomponent.TestCommandReceiver;
import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestRule;
@@ -98,7 +97,6 @@ public class FallbackRecentsTest {
@NavigationModeSwitch(mode = THREE_BUTTON)
@Test
- @Ignore // b/131630813
public void goToOverviewFromHome() {
mDevice.pressHome();
assertTrue("Fallback Launcher not visible", mDevice.wait(Until.hasObject(By.pkg(
@@ -109,7 +107,6 @@ public class FallbackRecentsTest {
@NavigationModeSwitch(mode = THREE_BUTTON)
@Test
- @Ignore // b/131630813
public void goToOverviewFromApp() {
startAppFast("com.android.settings");
diff --git a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
index 93e403cc8..e552f56ba 100644
--- a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
+++ b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
@@ -71,8 +71,7 @@ public class NavigationModeSwitchRule implements TestRule {
@Override
public Statement apply(Statement base, Description description) {
- // b/130558787; b/131419978
- if (false && TestHelpers.isInLauncherProcess() &&
+ if (TestHelpers.isInLauncherProcess() &&
description.getAnnotation(NavigationModeSwitch.class) != null) {
Mode mode = description.getAnnotation(NavigationModeSwitch.class).mode();
return new Statement() {