Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fd6d896 authored by Haiping Yang's avatar Haiping Yang Committed by Android (Google) Code Review
Browse files

Merge "Remove setting AMBIENT_GESTURE_SENSOR_ID which is never used."

parents 5294ff21 828f6e68

core/java/android/provider/Settings.java

+0 −6
Original line number Diff line number Diff line
@@ -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

























packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -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);

































packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java



+0
−3




























Original line number
Diff line number
Diff line








@@ -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));

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -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,