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

Merge "Remove subtitle of system default" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-13 11:17:00 +00:00
committed by Android (Google) Code Review
parent 55aba46fe9 9ee9787dd3
commit e9e6a00814
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -519,7 +519,7 @@
<string name="preference_of_system_locale_title">System language</string> <string name="preference_of_system_locale_title">System language</string>
<!-- Summary for preference of the system default locale. [CHAR LIMIT=50]--> <!-- Summary for preference of the system default locale. [CHAR LIMIT=50]-->
<string name="preference_of_system_locale_summary">System default - <xliff:g id="default_language" example="English (United States)">%1$s</xliff:g></string> <string name="preference_of_system_locale_summary">System default</string>
<!-- Description for the app without any supported languages. [CHAR LIMIT=NONE]--> <!-- Description for the app without any supported languages. [CHAR LIMIT=NONE]-->
<string name="desc_no_available_supported_locale">Language selection for this app isn\u2019t available from Settings.</string> <string name="desc_no_available_supported_locale">Language selection for this app isn\u2019t available from Settings.</string>

4
src/com/android/settings/applications/appinfo/AppLocaleDetails.java
View File

@@ -276,9 +276,7 @@ public class AppLocaleDetails extends SettingsPreferenceFragment {
final Context contextAsUser = context.createContextAsUser(userHandle, 0); final Context contextAsUser = context.createContextAsUser(userHandle, 0);
Locale appLocale = getAppDefaultLocale(contextAsUser, entry.info.packageName); Locale appLocale = getAppDefaultLocale(contextAsUser, entry.info.packageName);
if (appLocale == null) { if (appLocale == null) {
Locale systemLocale = Locale.getDefault(); return context.getString(R.string.preference_of_system_locale_summary);
return context.getString(R.string.preference_of_system_locale_summary,
systemLocale.getDisplayName(systemLocale));
} else { } else {
return appLocale.getDisplayName(appLocale); return appLocale.getDisplayName(appLocale);
} }