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

Merge "Fix empty resource showing "Und"" into tm-dev am: f71832b46b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17983788

Change-Id: Ie0c13dae6819e38f1f152e42fa22f7c841c60c4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Calvin Pan
2022-04-29 16:38:45 +00:00
committed by Automerger Merge Worker
parent 157987d894 f71832b46b
commit b5ba0f40cd
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/com/android/internal/app/AppLocaleStore.java
View File

@@ -51,13 +51,17 @@ class AppLocaleStore {
appSupportedLocales.add(packageLocaleList.get(i));
}
} else {
localeStatus = LocaleStatus.NO_SUPPORTED_LANGUAGE;
localeStatus = LocaleStatus.NO_SUPPORTED_LANGUAGE_IN_APP;
}
} else if (localeConfig.getStatus() == LocaleConfig.STATUS_NOT_SPECIFIED) {
localeStatus = LocaleStatus.GET_SUPPORTED_LANGUAGE_FROM_ASSET;
String[] languages = getAssetLocales(context, packageName);
for (String language : languages) {
appSupportedLocales.add(Locale.forLanguageTag(language));
if (languages.length > 0) {
localeStatus = LocaleStatus.GET_SUPPORTED_LANGUAGE_FROM_ASSET;
for (String language : languages) {
appSupportedLocales.add(Locale.forLanguageTag(language));
}
} else {
localeStatus = LocaleStatus.ASSET_LOCALE_IS_EMPTY;
}
}
}
@@ -89,7 +93,8 @@ class AppLocaleStore {
static class AppLocaleResult {
enum LocaleStatus {
UNKNOWN_FAILURE,
NO_SUPPORTED_LANGUAGE,
NO_SUPPORTED_LANGUAGE_IN_APP,
ASSET_LOCALE_IS_EMPTY,
GET_SUPPORTED_LANGUAGE_FROM_LOCAL_CONFIG,
GET_SUPPORTED_LANGUAGE_FROM_ASSET,
}