Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move SetupLocaleProperties to Settings.Global.

Browse Source 
Bug: 173818444
Test: manual test
Change-Id: Icda9c489534849a2f59e93195f9a6ded377d38b1
(cherry picked from commit 61a67de48545d27e7e8d10a19cc07d2cc8b86dea)
This commit is contained in:
Josh Yang
2020-12-01 23:20:20 -08:00
parent 8729fa2472
commit 8e7006c48b
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/provider/Settings.java
View File

@@ -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";
}
}

1
packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java
View File

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

4
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -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(