Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I6074890f6b085b89323bf550d4a6b0e02cc8e623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Calvin Pan
2022-05-25 07:08:01 +00:00
committed by Automerger Merge Worker
parent 957808c000 fa264b81be
commit dbb841121c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/app/SuggestedLocaleAdapter.java
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: