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

Merge "[Regional preference] Make prerference and fragment title are same." into udc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-03-15 08:55:50 +00:00
committed by Android (Google) Code Review
parent f826b3f427 97821a7317
commit bec6e40dd3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/regionalpreferences/NumberingPreferencesFragment.java
View File

@@ -23,6 +23,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.android.internal.app.LocaleHelper;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
@@ -53,9 +54,8 @@ public class NumberingPreferencesFragment extends DashboardFragment {
Log.w(getLogTag(), "No selected language."); Log.w(getLogTag(), "No selected language.");
return ""; return "";
} }
return Locale.forLanguageTag(selectedLanguage) Locale locale = Locale.forLanguageTag(selectedLanguage);
.stripExtensions() return LocaleHelper.getDisplayName(locale.stripExtensions(), locale, true);
.getDisplayName(Locale.forLanguageTag(selectedLanguage));
} }
Log.w(getLogTag(), "Incorrect option : " + option); Log.w(getLogTag(), "Incorrect option : " + option);
return ""; return "";