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

Commit 8e7006c4 authored by Josh Yang's avatar Josh Yang
Browse files

Move SetupLocaleProperties to Settings.Global. 

Bug: 173818444
Test: manual test
Change-Id: Icda9c489534849a2f59e93195f9a6ded377d38b1
(cherry picked from commit 61a67de48545d27e7e8d10a19cc07d2cc8b86dea)
parent 8729fa24

core/java/android/provider/Settings.java

+13 −0
Original line number Diff line number Diff line
@@ -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";















        }















    }







































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -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);















    }















}







































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+3
−1




























Original line number
Diff line number
Diff line








@@ -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<String> BACKUP_DENY_LIST_SECURE_SETTINGS =















             newHashSet(