Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 864c16d8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Only add system language on locale page" into tm-dev am: 66070d7c am: 5e1709fd 

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



Change-Id: I4a3d997e36c14a1d164109134e296262a32a0f5e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5c9129e3 5e1709fd

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);

                }

            }