diff options
3 files changed, 12 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index d5b525884ac1..8d054f4b1750 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6374,6 +6374,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> * <li> 0 = Off @@ -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); } /** diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java index 8e7180c4dc8d..935ea2549d49 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java @@ -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); diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java index cfc7743f0a8d..9938139293fd 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java @@ -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); } } |