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

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

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

Change-Id: Iedd7b9212a0bcede58ba7e62013d9fea8dab99de
This commit is contained in:
TreeHugger Robot
2020-06-18 18:25:23 +00:00
committed by Automerger Merge Worker
parent 8def3186e2 e9b912ff8c
commit 7548ef5c16
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/internal/app/ResolverListAdapter.java
View File

@@ -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.setText(subLabel);
if (showSubLabel || subLabel != null) {
text2.setVisibility(View.VISIBLE); text2.setVisibility(View.VISIBLE);
text2.setText(subLabel); } else {
text2.setVisibility(View.GONE);
} }
itemView.setContentDescription(null); itemView.setContentDescription(null);