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

Merge "Merge "Resolver/Chooser - Fix reuse of textview" into rvc-dev am: ab3811efea am: e9b912ff8c" into rvc-d1-dev-plus-aosp am: 002eb79d98

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

Change-Id: I80ac6c2b80e4c4446efcec890e9f503f8ab03baf
This commit is contained in:
Automerger Merge Worker
2020-06-18 18:47:30 +00:00
parent f28fb11e06 002eb79d98
commit 255ab0f0fb
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) {
if (!TextUtils.equals(text.getText(), label)) {
text.setText(label);
}
text.setText(label);
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.setText(subLabel);
} else {
text2.setVisibility(View.GONE);
}
itemView.setContentDescription(null);