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

Commit 35811953 authored by Calvin Pan's avatar Calvin Pan Committed by Automerger Merge Worker
Browse files

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

Merge "Fix using incorrect view in app language selection" into tm-dev am: fa264b81 am: 8a677d4a am: 17a7bb10

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



Change-Id: I9d75685d9b441cdbf2925f2d2530351eacef0784
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0126c449 17a7bb10

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: