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

Commit fa264b81 authored by Calvin Pan's avatar Calvin Pan Committed by Android (Google) Code Review
Browse files

Merge "Fix using incorrect view in app language selection" into tm-dev

parents 248de47f 5f8fa45e

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

+2 −2
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable { 
                        updatedView = mInflater.inflate(

                                R.layout.app_language_picker_current_locale_item,

                                parent, false);

                        addStateDescriptionIntoCurrentLocaleItem(convertView);

                        addStateDescriptionIntoCurrentLocaleItem(updatedView);

                    }

                } else {

                    shouldReuseView = convertView instanceof TextView
@@ -278,7 +278,7 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable { 
                if (!shouldReuseView) {

                    updatedView = mInflater.inflate(

                            R.layout.app_language_picker_current_locale_item, parent, false);

                    addStateDescriptionIntoCurrentLocaleItem(convertView);

                    addStateDescriptionIntoCurrentLocaleItem(updatedView);

                }

                break;

            default: