PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix unnecessary dialog" into main

Browse Source
This commit is contained in:
Allen Su
2025-02-04 03:18:05 -08:00
committed by Android (Google) Code Review
parent d829ec4675 caf664cd60
commit c32021846e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/regionalpreferences/RegionPickerBaseListPreferenceController.java
View File

@@ -154,7 +154,7 @@ public abstract class RegionPickerBaseListPreferenceController extends BasePrefe
private List<LocaleStore.LocaleInfo> getSortedLocaleList( private List<LocaleStore.LocaleInfo> getSortedLocaleList(
List<LocaleStore.LocaleInfo> localeInfos) { List<LocaleStore.LocaleInfo> localeInfos) {
final Locale sortingLocale = Locale.getDefault(); final Locale sortingLocale = LocaleList.getDefault().get(0);
final LocaleHelper.LocaleInfoComparator comp = final LocaleHelper.LocaleInfoComparator comp =
new LocaleHelper.LocaleInfoComparator(sortingLocale, true); new LocaleHelper.LocaleInfoComparator(sortingLocale, true);
Collections.sort(localeInfos, comp); Collections.sort(localeInfos, comp);
@@ -162,7 +162,7 @@ public abstract class RegionPickerBaseListPreferenceController extends BasePrefe
} }
private void switchRegion(LocaleStore.LocaleInfo localeInfo) { private void switchRegion(LocaleStore.LocaleInfo localeInfo) {
if (localeInfo.getLocale().equals(Locale.getDefault())) { if (localeInfo.getLocale().equals(LocaleList.getDefault().get(0))) {
return; return;
} }