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

Commit 2c176e7f authored by danielwbhuang's avatar danielwbhuang
Browse files

[Region picker] Add new flag to SettingsProvider 

 - Add a SettingsProvider flag to save the user's preferred region.

Bug: 370379278
Flag: EXEMPT trivial change
Test: Maunal test passed
Change-Id: I5c6e9d04510bc329a32d89ba4aaf035177548c9c
parent 320b9e02

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -6373,6 +6373,14 @@ public final class Settings { 
         */

        public static final String LOCALE_PREFERENCES = "locale_preferences";













        /**













         * User can change the region from region settings. This records user's preferred region.













         *













         * E.g. : if user's locale is en-US, this will record US













         * @hide













         */













        public static final String PREFERRED_REGION = "preferred_region";



























        /**















         * Setting to enable camera flash notification feature.















         * <ul>










@@ -6547,6 +6555,7 @@ public final class Settings {













            PRIVATE_SETTINGS.add(DEFAULT_DEVICE_FONT_SCALE);















            PRIVATE_SETTINGS.add(MOUSE_REVERSE_VERTICAL_SCROLLING);















            PRIVATE_SETTINGS.add(MOUSE_SWAP_PRIMARY_BUTTON);













            PRIVATE_SETTINGS.add(PREFERRED_REGION);















        }





























        /**

































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



+2
−1




























Original line number
Diff line number
Diff line








@@ -119,7 +119,8 @@ public class SystemSettings {













                Settings.System.SCREEN_FLASH_NOTIFICATION_COLOR,















                Settings.System.NOTIFICATION_COOLDOWN_ENABLED,















                Settings.System.NOTIFICATION_COOLDOWN_ALL,













                Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED













                Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED,













                Settings.System.PREFERRED_REGION















        ));















        if (Flags.backUpSmoothDisplayAndForcePeakRefreshRate()) {















            settings.add(Settings.System.PEAK_REFRESH_RATE);

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -265,5 +265,6 @@ public class SystemSettingsValidators {













        VALIDATORS.put(System.NOTIFICATION_COOLDOWN_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(System.NOTIFICATION_COOLDOWN_ALL, BOOLEAN_VALIDATOR);















        VALIDATORS.put(System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(System.PREFERRED_REGION, ANY_STRING_VALIDATOR);















    }















}