From 9ee9787dd393a922262c21a37c98c17efc417ac9 Mon Sep 17 00:00:00 2001
From: Calvin Pan <calvinpan@google.com>
Date: Wed, 13 Apr 2022 09:12:16 +0000
Subject: [PATCH] Remove subtitle of system default

Bug: 226894987
Test: manual
Change-Id: Iaa5e680567f5bb1d52f9a3ea911f1b573ba5b238
---
 res/values/strings.xml                                        | 2 +-
 .../settings/applications/appinfo/AppLocaleDetails.java       | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2e8bcc01822..553a1752350 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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>
diff --git a/src/com/android/settings/applications/appinfo/AppLocaleDetails.java b/src/com/android/settings/applications/appinfo/AppLocaleDetails.java
index 70383d17f24..4e5eb1d1abd 100644
--- a/src/com/android/settings/applications/appinfo/AppLocaleDetails.java
+++ b/src/com/android/settings/applications/appinfo/AppLocaleDetails.java
@@ -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);
         }