Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d213534 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove subtitle of system default" into tm-dev am: 107ce2cd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17741627



Change-Id: Iea7e7474def4166aad1b6cfac1858914b37e1748
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 68fb23eb 107ce2cd

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

+6 −10
Original line number Diff line number Diff line
@@ -217,22 +217,18 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable { 
                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);

                    }



                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)) {