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

Merge "[Regional Preferences] Remove u extension for subtitle of Language"

Browse Source
This commit is contained in:
Tom Hsu
2023-02-10 03:57:51 +00:00
committed by Android (Google) Code Review
parent 54003698b1 e2aeded3de
commit d3ff83eb4f
4 changed files with 89 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/localepicker/LocaleFeatureProviderImpl.java
View File

@@ -27,10 +27,16 @@ public class LocaleFeatureProviderImpl implements LocaleFeatureProvider {
@Override
public String getLocaleNames() {
final LocaleList locales = LocalePicker.getLocales();
Locale[] arrLocalesWithoutExtension = new Locale[locales.size()];
for (int i = 0; i < locales.size(); i++) {
arrLocalesWithoutExtension[i] = locales.get(i).stripExtensions();
}
final Locale displayLocale = Locale.getDefault();
return LocaleHelper.toSentenceCase(
LocaleHelper.getDisplayLocaleList(
locales, displayLocale, 2 /* Show up to two locales from the list */),
new LocaleList(arrLocalesWithoutExtension),
displayLocale,
2 /* Show up to two locales from the list */),
displayLocale);
}
}

13
src/com/android/settings/regionalpreferences/NumberingSystemController.java
View File

@@ -17,12 +17,9 @@
package com.android.settings.regionalpreferences;
import android.content.Context;
import android.os.LocaleList;
import com.android.settings.core.BasePreferenceController;
import java.util.Locale;
import java.util.StringJoiner;
import com.android.settings.localepicker.LocaleFeatureProviderImpl;
/** A controller for the entry of Numbering System's page */
public class NumberingSystemController extends BasePreferenceController {
@@ -50,12 +47,6 @@ public class NumberingSystemController extends BasePreferenceController {
@Override
public CharSequence getSummary() {
LocaleList localeList = LocaleList.getDefault();
StringJoiner stringJoiner = new StringJoiner(", ");
for (int i = 0; i < localeList.size(); i++) {
Locale locale = localeList.get(i);
stringJoiner.add(locale.stripExtensions().getDisplayName(locale));
}
return stringJoiner.toString();
return new LocaleFeatureProviderImpl().getLocaleNames();
}
}