Merge "Only add system language on locale page" into tm-dev (66070d7c) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/LocalePickerWithRegion.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}