Android/frameworks_base
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 15:43:38 +00:00
committed by Android (Google) Code Review
parent 27865be04c ccc952306e
commit 107ce2cd75
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/com/android/internal/app/SuggestedLocaleAdapter.java
View File

@@ -217,22 +217,18 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable {
break; break;
case TYPE_SYSTEM_LANGUAGE_FOR_APP_LANGUAGE_PICKER: case TYPE_SYSTEM_LANGUAGE_FOR_APP_LANGUAGE_PICKER:
if (!(convertView instanceof ViewGroup)) { if (!(convertView instanceof ViewGroup)) {
TextView title;
if (((LocaleStore.LocaleInfo)getItem(position)).isAppCurrentLocale()) { if (((LocaleStore.LocaleInfo)getItem(position)).isAppCurrentLocale()) {
convertView = mInflater.inflate( 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 { } else {
convertView = mInflater.inflate( 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);
} }
}
Locale defaultLocale = Locale.getDefault();
TextView title = convertView.findViewById(R.id.locale);
title.setText(R.string.system_locale_title); 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; break;
case TYPE_CURRENT_LOCALE: case TYPE_CURRENT_LOCALE:
if (!(convertView instanceof ViewGroup)) { if (!(convertView instanceof ViewGroup)) {