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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-10-22 12:11:12 +00:00
committed by Android (Google) Code Review
parent f932a2974e 814b4dd00c
commit ea523a0c22
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) { if (info instanceof DisplayResolveInfo) {
DisplayResolveInfo dri = (DisplayResolveInfo) info; DisplayResolveInfo dri = (DisplayResolveInfo) info;
boolean hasLabel = dri.hasDisplayLabel(); if (dri.hasDisplayLabel()) {
holder.bindLabel( holder.bindLabel(
dri.getDisplayLabel(), dri.getDisplayLabel(),
dri.getExtendedInfo(), dri.getExtendedInfo(),
hasLabel && alwaysShowSubLabel()); alwaysShowSubLabel());
holder.bindIcon(info); } else {
if (!hasLabel) { holder.bindLabel("", "", false);
loadLabel(dri); loadLabel(dri);
} }
holder.bindIcon(info);
if (!dri.hasDisplayIcon()) { if (!dri.hasDisplayIcon()) {
loadIcon(dri); loadIcon(dri);
} }