Merge "Only add system language on locale page" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
66070d7c8a
@@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user