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

Commit 3bfe0cc6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Create Settings.Global.Wearable.CLOCKWORK_LOCATION_TIME_ZONE_DETECTION_ENABLED" into main

parents 9c728ed7 55d29780

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -20375,6 +20375,12 @@ public final class Settings { 
            /** @hide */

            public static final int INVALID_AUTO_TIME_ZONE_STATE = 3;













            /** Store user enablement settings for location time zone detection













             * Type: int (0 to disabled, 1 to enabled)













             * @hide */













            public static final String CLOCKWORK_LOCATION_TIME_ZONE_DETECTION_ENABLED =













                    "clockwork_location_time_zone_detection_enabled";



























            /**















             * Whether 24 hour time format is enabled on the watch.















             * @hide

























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



+1
−0




























Original line number
Diff line number
Diff line








@@ -95,6 +95,7 @@ public class GlobalSettings {













        Settings.Global.Wearable.SMART_REPLIES_ENABLED,















        Settings.Global.Wearable.CLOCKWORK_AUTO_TIME,















        Settings.Global.Wearable.CLOCKWORK_AUTO_TIME_ZONE,













        Settings.Global.Wearable.CLOCKWORK_LOCATION_TIME_ZONE_DETECTION_ENABLED,















        Settings.Global.Wearable.CLOCKWORK_24HR_TIME,















        Settings.Global.Wearable.CONSISTENT_NOTIFICATION_BLOCKING_ENABLED,















        Settings.Global.Wearable.MUTE_WHEN_OFF_BODY_ENABLED,

































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



+2
−0




























Original line number
Diff line number
Diff line








@@ -253,6 +253,8 @@ public class GlobalSettingsValidators {













                            String.valueOf(Global.Wearable.AUTO_TIME_ZONE_OFF),















                            String.valueOf(Global.Wearable.INVALID_AUTO_TIME_ZONE_STATE)















                        }));













        VALIDATORS.put(Global.Wearable.CLOCKWORK_LOCATION_TIME_ZONE_DETECTION_ENABLED,













                BOOLEAN_VALIDATOR);















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















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















        VALIDATORS.put(Global.Wearable.WIFI_POWER_SAVE, ANY_INTEGER_VALIDATOR);