Merge "Using internal format cache for loading user badged label" into tm-qpr-dev
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user