diff options
| author | Vadim Tryshev <vadimt@google.com> | 2018-08-10 14:30:59 -0700 |
|---|---|---|
| committer | Vadim Tryshev <vadimt@google.com> | 2018-08-10 14:30:59 -0700 |
| commit | 309053fff9925eca6ce6f69ab0aa15381c92fd7f (patch) | |
| tree | e6b53af8e38dbcfb697d2c5a7040a1825327d005 /tests | |
| parent | 52b28f09264cb9689f3f88ca6d2f6f49ba654102 (diff) | |
| download | android_packages_apps_Trebuchet-309053fff9925eca6ce6f69ab0aa15381c92fd7f.tar.gz android_packages_apps_Trebuchet-309053fff9925eca6ce6f69ab0aa15381c92fd7f.tar.bz2 android_packages_apps_Trebuchet-309053fff9925eca6ce6f69ab0aa15381c92fd7f.zip | |
Using SWIPE_UP_SETTING_NAME in TAPL
Bug: 110103162
Test: TaplTests suite
Change-Id: Ia62207773a156aca1e226307ccc462c252cc9227
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Android.mk | 2 | ||||
| -rw-r--r-- | tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index c7a222a96..7a7d20399 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -35,7 +35,7 @@ include $(BUILD_PACKAGE) # Build rule for Tapl library. # include $(CLEAR_VARS) -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator +LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator libSharedSystemUI LOCAL_SRC_FILES := $(call all-java-files-under, tapl) \ ../quickstep/src/com/android/quickstep/SwipeUpSetting.java diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index c3f27eeeb..884a6cb58 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -16,6 +16,8 @@ package com.android.launcher3.tapl; +import static com.android.systemui.shared.system.SettingsCompat.SWIPE_UP_SETTING_NAME; + import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -96,7 +98,7 @@ public final class LauncherInstrumentation { SwipeUpSetting.isSwipeUpEnabledDefaultValue(); mSwipeUpEnabled = Settings.Secure.getInt( InstrumentationRegistry.getTargetContext().getContentResolver(), - "swipe_up_to_switch_apps_enabled", + SWIPE_UP_SETTING_NAME, swipeUpEnabledDefault ? 1 : 0) == 1; assertTrue("Device must run in a test harness", ActivityManager.isRunningInTestHarness()); } |