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

Commit 6eebdb9f 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 

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



Change-Id: I727efb34ab8ceed0605ca649dc223712890e6b58
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 597a9a91 66070d7c

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

                }

            }