Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I4a3d997e36c14a1d164109134e296262a32a0f5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-13 11:22:53 +00:00
committed by Automerger Merge Worker
parent 5c9129e3b8 5e1709fd3e
commit 864c16d8cb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/app/LocalePickerWithRegion.java
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);
} }
} }