Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2875b816 authored by Vadim Tryshev's avatar Vadim Tryshev Committed by android-build-merger
Browse files

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

am: ba0ff366

Change-Id: I582b798684e524c74f82c33fd175b6c8aca8b404
parents 0859e561 ba0ff366

quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java

+8 −4
Original line number Diff line number Diff line
@@ -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);