Merge "Taking local screenshot before navigation state is restored" into ub-launcher3-qt-dev am: e7f313dc0c

am: be8f7d2845

Change-Id: I9d24a4ef7f5f44018863ab23cc86435de1ce2f78

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

@@ -18,14 +18,14 @@ package com.android.quickstep;
 
 import com.android.launcher3.ui.AbstractLauncherUiTest;
 
-import org.junit.Rule;
-import org.junit.rules.TestRule;
+import org.junit.rules.RuleChain;
 
 /**
  * Base class for all instrumentation tests that deal with Quickstep.
  */
 public abstract class AbstractQuickStepTest extends AbstractLauncherUiTest {
-    @Rule
-    public TestRule mQuickstepOnOffExecutor =
-            new NavigationModeSwitchRule(mLauncher);
+    protected AbstractQuickStepTest() {
+        mOrderSensitiveRules = RuleChain.outerRule(new NavigationModeSwitchRule(mLauncher)).
+                around(mOrderSensitiveRules);
+    }
 }