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 am: e9e6a00814

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17742044

Change-Id: I4ebd982da6ee7646fa17fb35010dd38df877b5db
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:56:47 +00:00
committed by Automerger Merge Worker
parent 18b0dde5d7 e9e6a00814
commit f7a3cadb96
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>
<!-- 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]-->
<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);
Locale appLocale = getAppDefaultLocale(contextAsUser, entry.info.packageName);
if (appLocale == null) {
Locale systemLocale = Locale.getDefault();
return context.getString(R.string.preference_of_system_locale_summary,
systemLocale.getDisplayName(systemLocale));
return context.getString(R.string.preference_of_system_locale_summary);
} else {
return appLocale.getDisplayName(appLocale);
}