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

This commit is contained in:
Calvin Pan
2022-05-25 06:51:35 +00:00
committed by Android (Google) Code Review

View File

@@ -261,7 +261,7 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable {
updatedView = mInflater.inflate( updatedView = mInflater.inflate(
R.layout.app_language_picker_current_locale_item, R.layout.app_language_picker_current_locale_item,
parent, false); parent, false);
addStateDescriptionIntoCurrentLocaleItem(convertView); addStateDescriptionIntoCurrentLocaleItem(updatedView);
} }
} else { } else {
shouldReuseView = convertView instanceof TextView shouldReuseView = convertView instanceof TextView
@@ -278,7 +278,7 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable {
if (!shouldReuseView) { if (!shouldReuseView) {
updatedView = mInflater.inflate( updatedView = mInflater.inflate(
R.layout.app_language_picker_current_locale_item, parent, false); R.layout.app_language_picker_current_locale_item, parent, false);
addStateDescriptionIntoCurrentLocaleItem(convertView); addStateDescriptionIntoCurrentLocaleItem(updatedView);
} }
break; break;
default: default: