diff options
author | vadimt <vadimt@google.com> | 2019-04-04 13:56:18 -0700 |
---|---|---|
committer | vadimt <vadimt@google.com> | 2019-04-04 14:36:53 -0700 |
commit | 2a0670890a0b9971d5eada3c3e72507bddb7186c (patch) | |
tree | 6e2dff8dc35b0e8c7828463afc849e711ab0e4a6 /quickstep/tests/src | |
parent | 24eb1c9c89f26f2371cc26c1eaa4e647820f2f0b (diff) | |
download | android_packages_apps_Trebuchet-2a0670890a0b9971d5eada3c3e72507bddb7186c.tar.gz android_packages_apps_Trebuchet-2a0670890a0b9971d5eada3c3e72507bddb7186c.tar.bz2 android_packages_apps_Trebuchet-2a0670890a0b9971d5eada3c3e72507bddb7186c.zip |
Not using system res ids in tests
Change-Id: I3aad2380dd6cd51ee23803cf5164f8b332a62e98
Diffstat (limited to 'quickstep/tests/src')
-rw-r--r-- | quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java | 7 |
1 files changed, 3 insertions, 4 deletions
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 +} |