summaryrefslogtreecommitdiffstats
path: root/quickstep/tests/src
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2019-06-14 01:53:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-06-14 01:53:26 +0000
commit0d5bd65e6e468628594d13135912134c4fa26650 (patch)
tree1ace20991c558944b3c98b0d553227798740518a /quickstep/tests/src
parent924a96651d5dd30559c8420fa27789b248a1b943 (diff)
parent5ad52ec092cb934760d3a9b693546b4377a92025 (diff)
downloadandroid_packages_apps_Trebuchet-0d5bd65e6e468628594d13135912134c4fa26650.tar.gz
android_packages_apps_Trebuchet-0d5bd65e6e468628594d13135912134c4fa26650.tar.bz2
android_packages_apps_Trebuchet-0d5bd65e6e468628594d13135912134c4fa26650.zip
Merge "After switching nav mode, wait for the sysui mode to sync" into ub-launcher3-qt-dev
Diffstat (limited to 'quickstep/tests/src')
-rw-r--r--quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java45
1 files changed, 40 insertions, 5 deletions
diff --git a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
index c3e46ea11..90763b871 100644
--- a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
+++ b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
@@ -33,6 +33,7 @@ import androidx.test.uiautomator.UiDevice;
import com.android.launcher3.tapl.LauncherInstrumentation;
import com.android.launcher3.tapl.TestHelpers;
+import com.android.systemui.shared.system.QuickStepContract;
import org.junit.Assert;
import org.junit.rules.TestRule;
@@ -43,6 +44,8 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
/**
* Test rule that allows executing a test with Quickstep on and then Quickstep off.
@@ -78,11 +81,14 @@ public class NavigationModeSwitchRule implements TestRule {
@Override
public void evaluate() throws Throwable {
final Context context = getInstrumentation().getContext();
- final String prevOverlayPkg = LauncherInstrumentation.isGesturalMode(context)
- ? NAV_BAR_MODE_GESTURAL_OVERLAY
- : LauncherInstrumentation.isSwipeUpMode(context)
- ? NAV_BAR_MODE_2BUTTON_OVERLAY
- : NAV_BAR_MODE_3BUTTON_OVERLAY;
+ final int currentInteractionMode =
+ LauncherInstrumentation.getCurrentInteractionMode(context);
+ final String prevOverlayPkg =
+ QuickStepContract.isGesturalMode(currentInteractionMode)
+ ? NAV_BAR_MODE_GESTURAL_OVERLAY
+ : QuickStepContract.isSwipeUpMode(currentInteractionMode)
+ ? NAV_BAR_MODE_2BUTTON_OVERLAY
+ : NAV_BAR_MODE_3BUTTON_OVERLAY;
final LauncherInstrumentation.NavigationModel originalMode =
mLauncher.getNavigationModel();
try {
@@ -131,6 +137,27 @@ public class NavigationModeSwitchRule implements TestRule {
setOverlayPackageEnabled(NAV_BAR_MODE_GESTURAL_OVERLAY,
overlayPackage == NAV_BAR_MODE_GESTURAL_OVERLAY);
+ if (currentSysUiNavigationMode() != expectedMode) {
+ final CountDownLatch latch = new CountDownLatch(1);
+ final Context targetContext = getInstrumentation().getTargetContext();
+ final SysUINavigationMode.NavigationModeChangeListener listener =
+ newMode -> {
+ if (LauncherInstrumentation.getNavigationModel(newMode.resValue)
+ == expectedMode) {
+ latch.countDown();
+ }
+ };
+ final SysUINavigationMode sysUINavigationMode =
+ SysUINavigationMode.INSTANCE.get(targetContext);
+ targetContext.getMainExecutor().execute(() ->
+ sysUINavigationMode.addModeChangeListener(listener));
+ latch.await(10, TimeUnit.SECONDS);
+ targetContext.getMainExecutor().execute(() ->
+ sysUINavigationMode.removeModeChangeListener(listener));
+ Assert.assertTrue("Navigation mode didn't change to " + expectedMode,
+ currentSysUiNavigationMode() == expectedMode);
+ }
+
for (int i = 0; i != 100; ++i) {
if (mLauncher.getNavigationModel() == expectedMode) {
Thread.sleep(5000);
@@ -153,4 +180,12 @@ public class NavigationModeSwitchRule implements TestRule {
return base;
}
}
+
+ private static LauncherInstrumentation.NavigationModel currentSysUiNavigationMode() {
+ return LauncherInstrumentation.getNavigationModel(
+ SysUINavigationMode.getMode(
+ getInstrumentation().
+ getTargetContext()).
+ resValue);
+ }
}