From 2a0670890a0b9971d5eada3c3e72507bddb7186c Mon Sep 17 00:00:00 2001 From: vadimt Date: Thu, 4 Apr 2019 13:56:18 -0700 Subject: Not using system res ids in tests Change-Id: I3aad2380dd6cd51ee23803cf5164f8b332a62e98 --- .../tests/src/com/android/quickstep/NavigationModeSwitchRule.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'quickstep/tests/src') diff --git a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java index 895485ddf..6034791d7 100644 --- a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java +++ b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java @@ -32,7 +32,6 @@ 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; @@ -78,9 +77,9 @@ public class NavigationModeSwitchRule implements TestRule { @Override public void evaluate() throws Throwable { final Context context = getInstrumentation().getContext(); - final String prevOverlayPkg = QuickStepContract.isGesturalMode(context) + final String prevOverlayPkg = LauncherInstrumentation.isGesturalMode(context) ? NAV_BAR_MODE_GESTURAL_OVERLAY - : QuickStepContract.isSwipeUpMode(context) + : LauncherInstrumentation.isSwipeUpMode(context) ? NAV_BAR_MODE_2BUTTON_OVERLAY : NAV_BAR_MODE_3BUTTON_OVERLAY; final LauncherInstrumentation.NavigationModel originalMode = @@ -150,4 +149,4 @@ public class NavigationModeSwitchRule implements TestRule { return base; } } -} \ No newline at end of file +} -- cgit v1.2.3