commit 107ce2cd75dc117f62447b473453bb515a084a20
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 13 15:43:38 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 13 15:43:38 2022 +0000
tree 9dddf80d99f6a3d4549632de7e6725c00683028d
parent 27865be04c54e5d063f152543abcec17bfe82bab
parent ccc952306e1c6e0647163368fca8bc010b3e76db

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

core/java/com/android/internal/app/SuggestedLocaleAdapter.java

diff --git a/core/java/com/android/internal/app/SuggestedLocaleAdapter.java b/core/java/com/android/internal/app/SuggestedLocaleAdapter.java
index 68b8968..18fde47 100644
--- a/core/java/com/android/internal/app/SuggestedLocaleAdapter.java
+++ b/core/java/com/android/internal/app/SuggestedLocaleAdapter.java
@@ -217,22 +217,18 @@
                 break;
             case TYPE_SYSTEM_LANGUAGE_FOR_APP_LANGUAGE_PICKER:
                 if (!(convertView instanceof ViewGroup)) {
+                    TextView title;
                     if (((LocaleStore.LocaleInfo)getItem(position)).isAppCurrentLocale()) {
                         convertView = mInflater.inflate(
-                                R.layout.app_language_picker_system_current, parent, false);
+                                R.layout.app_language_picker_current_locale_item, parent, false);
+                        title = convertView.findViewById(R.id.language_picker_item);
                     } else {
                         convertView = mInflater.inflate(
-                                R.layout.app_language_picker_system_default, parent, false);
+                                R.layout.language_picker_item, parent, false);
+                        title = convertView.findViewById(R.id.locale);
                     }
+                    title.setText(R.string.system_locale_title);
                 }
-
-                Locale defaultLocale = Locale.getDefault();
-                TextView title = convertView.findViewById(R.id.locale);
-                title.setText(R.string.system_locale_title);
-                title.setTextLocale(defaultLocale);
-                TextView subtitle = convertView.findViewById(R.id.system_locale_subtitle);
-                subtitle.setText(defaultLocale.getDisplayName());
-                subtitle.setTextLocale(defaultLocale);
                 break;
             case TYPE_CURRENT_LOCALE:
                 if (!(convertView instanceof ViewGroup)) {