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

Merge "Fix labels loading regression" into tm-qpr-dev am: ea523a0c22

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

Change-Id: I16b913cd6485caf4aa2001d3ef422e4436a9f27d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-10-22 12:40:37 +00:00
committed by Automerger Merge Worker
parent 4447541f5d ea523a0c22
commit 2df43628c6
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -647,15 +647,16 @@ public class ResolverListAdapter extends BaseAdapter {
if (info instanceof DisplayResolveInfo) {
DisplayResolveInfo dri = (DisplayResolveInfo) info;
boolean hasLabel = dri.hasDisplayLabel();
holder.bindLabel(
dri.getDisplayLabel(),
dri.getExtendedInfo(),
hasLabel && alwaysShowSubLabel());
holder.bindIcon(info);
if (!hasLabel) {
if (dri.hasDisplayLabel()) {
holder.bindLabel(
dri.getDisplayLabel(),
dri.getExtendedInfo(),
alwaysShowSubLabel());
} else {
holder.bindLabel("", "", false);
loadLabel(dri);
}
holder.bindIcon(info);
if (!dri.hasDisplayIcon()) {
loadIcon(dri);
}