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

Merge "Only add system language on locale page" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-13 10:18:37 +00:00
committed by Android (Google) Code Review
parent 26d79e363e 4c41490cb3
commit 66070d7c8a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/app/LocalePickerWithRegion.java
View File

@@ -176,8 +176,9 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O
// Add current system language into suggestion list
for(LocaleStore.LocaleInfo localeInfo: LocaleStore.getSystemCurrentLocaleInfo()) {
if (appCurrentLocale == null ||
!localeInfo.getLocale().equals(appCurrentLocale.getLocale())) {
boolean isNotCurrentLocale = appCurrentLocale == null
|| !localeInfo.getLocale().equals(appCurrentLocale.getLocale());
if (!isForCountryMode && isNotCurrentLocale) {
mLocaleList.add(localeInfo);
}
}