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

Commit 82864d5e authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Using internal format cache for loading user badged label" into tm-qpr-dev

parents 85d15e78 efad3c2f

src/com/android/launcher3/icons/IconCache.java

+1 −2
Original line number Diff line number Diff line
@@ -497,8 +497,7 @@ public class IconCache extends BaseIconCache { 
        WidgetSection widgetSection = WidgetSections.getWidgetSections(mContext)

                .get(infoInOut.widgetCategory);

        infoInOut.title = mContext.getString(widgetSection.mSectionTitle);

        infoInOut.contentDescription = mPackageManager.getUserBadgedLabel(

                infoInOut.title, infoInOut.user);

        infoInOut.contentDescription = getUserBadgedLabel(infoInOut.title, infoInOut.user);

        final BitmapInfo cachedBitmap = mWidgetCategoryBitmapInfos.get(infoInOut.widgetCategory);

        if (cachedBitmap != null) {

            infoInOut.bitmap = getBadgedIcon(cachedBitmap, infoInOut.user);

src/com/android/launcher3/model/LoaderCursor.java

+2 −2
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ public class LoaderCursor extends CursorWrapper { 
            throw new InvalidParameterException("Invalid restoreType " + restoreFlag);

        }



        info.contentDescription = mPM.getUserBadgedLabel(info.title, info.user);

        info.contentDescription = mIconCache.getUserBadgedLabel(info.title, info.user);

        info.itemType = itemType;

        info.status = restoreFlag;

        return info;
@@ -381,7 +381,7 @@ public class LoaderCursor extends CursorWrapper { 
            }

        }



        info.contentDescription = mPM.getUserBadgedLabel(info.title, info.user);

        info.contentDescription = mIconCache.getUserBadgedLabel(info.title, info.user);

        return info;

    }