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

Commit cbc52b6a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Resolver/Chooser - Fix reuse of textview" into rvc-dev am:... 

Merge "Merge "Resolver/Chooser - Fix reuse of textview" into rvc-dev am: ab3811ef am: e9b912ff" into rvc-d1-dev-plus-aosp am: 002eb79d am: 255ab0f0

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

Change-Id: Iebceb497dadfdc9806d8a64315a50213ef2376ca
parents 0af9f181 255ab0f0

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

+6 −6
Original line number Original line Diff line number Diff line
@@ -689,17 +689,17 @@ public class ResolverListAdapter extends BaseAdapter { 
        }

        }





        public void bindLabel(CharSequence label, CharSequence subLabel, boolean showSubLabel) {

        public void bindLabel(CharSequence label, CharSequence subLabel, boolean showSubLabel) {

            if (!TextUtils.equals(text.getText(), label)) {

            text.setText(label);

            text.setText(label);

            }





            if (TextUtils.equals(label, subLabel)) {

            if (TextUtils.equals(label, subLabel)) {

                subLabel = "";

                subLabel = null;

            }

            }





            if (showSubLabel || !TextUtils.equals(text2.getText(), subLabel)) {

                text2.setVisibility(View.VISIBLE);

            text2.setText(subLabel);

            text2.setText(subLabel);

            if (showSubLabel || subLabel != null) {

                text2.setVisibility(View.VISIBLE);

            } else {

                text2.setVisibility(View.GONE);

            }

            }





            itemView.setContentDescription(null);

            itemView.setContentDescription(null);