diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 3d59b03e71ca2..ae09b45a8f991 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -16689,12 +16689,6 @@ public final class Settings { */ public static final String AMBIENT_FORCE_WHEN_DOCKED = "ambient_force_when_docked"; - /** - * The id of the gesture sensor. - * @hide - */ - public static final String AMBIENT_GESTURE_SENSOR_ID = "ambient_gesture_sensor_id"; - /** * Whether the ambient low bit mode is enabled. * @hide diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index bf62f1dfb75ba..a10b8194ba5ef 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -262,7 +262,6 @@ public class GlobalSettingsValidators { VALIDATORS.put(Global.Wearable.AMBIENT_TOUCH_TO_WAKE, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.DECOMPOSABLE_WATCHFACE, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.AMBIENT_FORCE_WHEN_DOCKED, BOOLEAN_VALIDATOR); - VALIDATORS.put(Global.Wearable.AMBIENT_GESTURE_SENSOR_ID, ANY_INTEGER_VALIDATOR); VALIDATORS.put(Global.Wearable.AMBIENT_LOW_BIT_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.AMBIENT_PLUGGED_TIMEOUT_MIN, ANY_INTEGER_VALIDATOR); VALIDATORS.put(Global.Wearable.AMBIENT_TILT_TO_BRIGHT, BOOLEAN_VALIDATOR); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index aca70f12758d5..ce7517f14e77c 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -5324,9 +5324,6 @@ public class SettingsProvider extends ContentProvider { initGlobalSettingsDefaultValForWearLocked( Settings.Global.Wearable.AMBIENT_FORCE_WHEN_DOCKED, SystemProperties.getBoolean("ro.ambient.force_when_docked", false)); - initGlobalSettingsDefaultValForWearLocked( - Settings.Global.Wearable.AMBIENT_GESTURE_SENSOR_ID, - SystemProperties.getInt("ro.ambient.gesture_sensor_id", 0)); initGlobalSettingsDefaultValForWearLocked( Settings.Global.Wearable.AMBIENT_LOW_BIT_ENABLED, SystemProperties.getBoolean("ro.ambient.low_bit_enabled", false)); diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 324c05e3cbe07..c9c93c48af9d4 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -640,7 +640,6 @@ public class SettingsBackupTest { Settings.Global.Wearable.AMBIENT_TILT_TO_BRIGHT, Settings.Global.Wearable.DECOMPOSABLE_WATCHFACE, Settings.Global.Wearable.AMBIENT_FORCE_WHEN_DOCKED, - Settings.Global.Wearable.AMBIENT_GESTURE_SENSOR_ID, Settings.Global.Wearable.AMBIENT_LOW_BIT_ENABLED, Settings.Global.Wearable.AMBIENT_PLUGGED_TIMEOUT_MIN, Settings.Global.Wearable.PAIRED_DEVICE_OS_TYPE,