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

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

Change-Id: I47c339042eb16d7f80e77ca059ea2e06145d47fb
This commit is contained in:
TreeHugger Robot
2020-06-18 18:10:55 +00:00
committed by Automerger Merge Worker
parent 67fd0fd1ac ab3811efea
commit 413da06bd3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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.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);