Merge "Fix labels loading regression" into tm-qpr-dev (ea523a0c) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ResolverListAdapter.java

+8 −7

Original line number	Diff line number	Diff line
		@@ -647,15 +647,16 @@ public class ResolverListAdapter extends BaseAdapter {

		if (info instanceof DisplayResolveInfo) {
		DisplayResolveInfo dri = (DisplayResolveInfo) info;
		boolean hasLabel = dri.hasDisplayLabel();
		if (dri.hasDisplayLabel()) {
		holder.bindLabel(
		dri.getDisplayLabel(),
		dri.getExtendedInfo(),
		hasLabel && alwaysShowSubLabel());
		holder.bindIcon(info);
		if (!hasLabel) {
		alwaysShowSubLabel());
		} else {
		holder.bindLabel("", "", false);
		loadLabel(dri);
		}
		holder.bindIcon(info);
		if (!dri.hasDisplayIcon()) {
		loadIcon(dri);
		}