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

This commit is contained in:
TreeHugger Robot
2022-04-13 10:18:37 +00:00
committed by Android (Google) Code Review

View File

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