From 8e7006c48b4fc827f8a57de91cf6dcfa59ad177f Mon Sep 17 00:00:00 2001 From: Josh Yang Date: Tue, 1 Dec 2020 23:20:20 -0800 Subject: [PATCH] Move SetupLocaleProperties to Settings.Global. Bug: 173818444 Test: manual test Change-Id: Icda9c489534849a2f59e93195f9a6ded377d38b1 (cherry picked from commit 61a67de48545d27e7e8d10a19cc07d2cc8b86dea) --- core/java/android/provider/Settings.java | 13 +++++++++++++ .../validators/GlobalSettingsValidators.java | 1 + .../src/android/provider/SettingsBackupTest.java | 4 +++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 88e7ffc18ec2e..79b8dbc338fb9 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -16653,6 +16653,19 @@ public final class Settings { // Companion os version constants /** @hide */ public static final int COMPANION_OS_VERSION_UNDEFINED = -1; + + /** + * A boolean value to indicate if we want to support all languages in LE edition on + * wear. 1 for supporting, 0 for not supporting. + * @hide + */ + public static final String ENABLE_ALL_LANGUAGES = "enable_all_languages"; + + /** + * The Locale (as language tag) the user chose at startup. + * @hide + */ + public static final String SETUP_LOCALE = "setup_locale"; } } diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index b5a7c84a35d8c..690ace78fa993 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -290,6 +290,7 @@ public class GlobalSettingsValidators { })); VALIDATORS.put(Global.Wearable.HFP_CLIENT_PROFILE_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.COMPANION_OS_VERSION, ANY_INTEGER_VALIDATOR); + VALIDATORS.put(Global.Wearable.ENABLE_ALL_LANGUAGES, BOOLEAN_VALIDATOR); } } diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index a35ec99a18371..9e65799eeb3ff 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -652,7 +652,9 @@ public class SettingsBackupTest { Settings.Global.Wearable.COMPANION_NAME, Settings.Global.Wearable.USER_HFP_CLIENT_SETTING, Settings.Global.Wearable.HFP_CLIENT_PROFILE_ENABLED, - Settings.Global.Wearable.COMPANION_OS_VERSION); + Settings.Global.Wearable.COMPANION_OS_VERSION, + Settings.Global.Wearable.ENABLE_ALL_LANGUAGES, + Settings.Global.Wearable.SETUP_LOCALE); private static final Set BACKUP_DENY_LIST_SECURE_SETTINGS = newHashSet(