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

Commit 986e4533 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ia0a757d0792a7981a74bc4f152b2cf31e271fec2
parents 44d53972 ab3811ef

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

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



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

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

            text.setText(label);

            }



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

                subLabel = "";

                subLabel = null;

            }



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

                text2.setVisibility(View.VISIBLE);

            text2.setText(subLabel);

            if (showSubLabel || subLabel != null) {

                text2.setVisibility(View.VISIBLE);

            } else {

                text2.setVisibility(View.GONE);

            }



            itemView.setContentDescription(null);