Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4675c02 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix labels loading regression" into tm-qpr-dev am: ea523a0c am: 2df43628 

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



Change-Id: I90e81125fe22af0e1c5ec0dbe1ba97ea7298cef6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fe911f2a 2df43628

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

            }