From 185325a607750a5cdfdc0de938fbd638ac6826df Mon Sep 17 00:00:00 2001 From: Josh Yang Date: Wed, 16 Dec 2020 19:34:09 -0800 Subject: [PATCH] Remove UPDOWN_GESTURES_ENABLED settings. Bug: 175821889 Test: unit test and manaul test Change-Id: I371a24bac05bae8e9e465ee50ad6b76672897481 --- core/java/android/provider/Settings.java | 6 ------ packages/SettingsProvider/res/values/defaults.xml | 3 --- .../settings/validators/GlobalSettingsValidators.java | 1 - .../com/android/providers/settings/SettingsProvider.java | 5 ----- .../test/src/android/provider/SettingsBackupTest.java | 1 - 5 files changed, 16 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index d08475d09faa1..94ec5d0368c45 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -16547,12 +16547,6 @@ public final class Settings { public static final String ALT_BYPASS_WIFI_REQUIREMENT_TIME_MILLIS = "alt_bypass_wifi_requirement_time_millis"; - /** - * Whether or not Up/Down Gestures are enabled. - * @hide - */ - public static final String UPDOWN_GESTURES_ENABLED = "updown_gestures_enabled"; - /** * Whether the setup was skipped. * @hide diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index cf960aac56ac3..7fd6d52d88071 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -272,9 +272,6 @@ 120 - - false - true diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index a10b8194ba5ef..d28a8b4812718 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -205,7 +205,6 @@ public class GlobalSettingsValidators { VALIDATORS.put( Global.Wearable.ALT_BYPASS_WIFI_REQUIREMENT_TIME_MILLIS, ANY_INTEGER_VALIDATOR); - VALIDATORS.put(Global.Wearable.UPDOWN_GESTURES_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put( Global.Wearable.SETUP_SKIPPED, new DiscreteValueValidator( diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index ce7517f14e77c..ad38cc60664b8 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -5242,11 +5242,6 @@ public class SettingsProvider extends ContentProvider { .def_wearable_offChargerWifiUsageLimitMinutes)); initGlobalSettingsDefaultValForWearLocked( Global.Wearable.ALT_BYPASS_WIFI_REQUIREMENT_TIME_MILLIS, 0L); - initGlobalSettingsDefaultValForWearLocked( - Global.Wearable.UPDOWN_GESTURES_ENABLED, - getContext() - .getResources() - .getBoolean(R.bool.def_wearable_upDownGesturesEnabled)); initGlobalSettingsDefaultValForWearLocked( Global.Wearable.SETUP_SKIPPED, Global.Wearable.SETUP_SKIPPED_UNKNOWN); initGlobalSettingsDefaultValForWearLocked( diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index c9c93c48af9d4..24623bfc0df09 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -610,7 +610,6 @@ public class SettingsBackupTest { Settings.Global.Wearable.AUTO_WIFI, Settings.Global.Wearable.WIFI_POWER_SAVE, Settings.Global.Wearable.ALT_BYPASS_WIFI_REQUIREMENT_TIME_MILLIS, - Settings.Global.Wearable.UPDOWN_GESTURES_ENABLED, Settings.Global.Wearable.SETUP_SKIPPED, Settings.Global.Wearable.LAST_CALL_FORWARD_ACTION, Settings.Global.Wearable.STEM_1_TYPE,