PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "Enabling continuous testing of all 3 modes of navigation" into ub-launcher3-qt-dev

Browse Source
This commit is contained in:
Vadim Tryshev
2019-04-18 19:36:26 +00:00
committed by Android (Google) Code Review
parent 8d513677ea dd0b3624a5
commit ba0ff3665c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
+8 -4
View File
@@ -21,6 +21,7 @@ import static androidx.test.InstrumentationRegistry.getInstrumentation;
import static com.android.quickstep.NavigationModeSwitchRule.Mode.ALL;
import static com.android.quickstep.NavigationModeSwitchRule.Mode.THREE_BUTTON;
import static com.android.quickstep.NavigationModeSwitchRule.Mode.TWO_BUTTON;
import static com.android.quickstep.NavigationModeSwitchRule.Mode.ZERO_BUTTON;
import static com.android.systemui.shared.system.QuickStepContract.NAV_BAR_MODE_2BUTTON_OVERLAY;
import static com.android.systemui.shared.system.QuickStepContract.NAV_BAR_MODE_3BUTTON_OVERLAY;
import static com.android.systemui.shared.system.QuickStepContract.NAV_BAR_MODE_GESTURAL_OVERLAY;
@@ -85,9 +86,9 @@ public class NavigationModeSwitchRule implements TestRule {
final LauncherInstrumentation.NavigationModel originalMode =
mLauncher.getNavigationModel();
try {
// if (mode == ZERO_BUTTON || mode == ALL) {
// evaluateWithZeroButtons();
// }
if (mode == ZERO_BUTTON || mode == ALL) {
evaluateWithZeroButtons();
}
if (mode == TWO_BUTTON || mode == ALL) {
evaluateWithTwoButtons();
}
@@ -131,7 +132,10 @@ public class NavigationModeSwitchRule implements TestRule {
overlayPackage == NAV_BAR_MODE_GESTURAL_OVERLAY);
for (int i = 0; i != 100; ++i) {
if (mLauncher.getNavigationModel() == expectedMode) return;
if (mLauncher.getNavigationModel() == expectedMode) {
Thread.sleep(1000);
return;
}
Thread.sleep(100);
}
Assert.fail("Couldn't switch to " + overlayPackage);