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

Commit 89085f60 authored by Prakriti Gupta's avatar Prakriti Gupta Committed by Android (Google) Code Review
Browse files

Merge "Rename the WF Setting name to be more exact"

parents d54dd08f ec519e54

core/java/android/provider/Settings.java

+2 −1
Original line number Diff line number Diff line
@@ -17448,7 +17448,8 @@ public final class Settings { 
             * Whether touch and hold to edit WF is enabled

             * @hide

             */

            public static final String TOUCH_AND_HOLD_WATCH_FACE = "touch_and_hold_watchface";

            public static final String GESTURE_TOUCH_AND_HOLD_WATCH_FACE_ENABLED =

                    "gesture_touch_and_hold_watchface_enabled";















            /**















             * Whether bedtime mode is enabled.

























packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -92,7 +92,7 @@ public class GlobalSettings {













        Settings.Global.Wearable.AMBIENT_ENABLED,















        Settings.Global.Wearable.AMBIENT_TILT_TO_WAKE,















        Settings.Global.Wearable.AMBIENT_TOUCH_TO_WAKE,













        Settings.Global.Wearable.TOUCH_AND_HOLD_WATCH_FACE,













        Settings.Global.Wearable.GESTURE_TOUCH_AND_HOLD_WATCH_FACE_ENABLED,















        Settings.Global.Wearable.BATTERY_SAVER_MODE,















        Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS,















        Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER

































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



+2
−1




























Original line number
Diff line number
Diff line








@@ -331,7 +331,8 @@ public class GlobalSettingsValidators {













        VALIDATORS.put(Global.USER_PREFERRED_RESOLUTION_WIDTH, ANY_INTEGER_VALIDATOR);















        VALIDATORS.put(Global.Wearable.WET_MODE_ON, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Global.Wearable.COOLDOWN_MODE_ON, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Global.Wearable.TOUCH_AND_HOLD_WATCH_FACE, BOOLEAN_VALIDATOR);













        VALIDATORS.put(













                Global.Wearable.GESTURE_TOUCH_AND_HOLD_WATCH_FACE_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Global.Wearable.SCREEN_UNLOCK_SOUND_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Global.Wearable.CHARGING_SOUNDS_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Global.Wearable.BEDTIME_MODE, BOOLEAN_VALIDATOR);