diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 2093b3f39a337..030f1711d4b71 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -16669,12 +16669,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 07b24f0a1eb9f..7732da40aac27 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 8da9e35a2ab22..08e491db72478 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 b3470700bb5ce..d771c7c643f75 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -5241,11 +5241,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 cd85904589a65..f0f2c0fef65c4 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -611,7 +611,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,