Fixing shortcut icons are not getting correct color extraction.

> Avoiding color extraction for icons which have already be evaluated
> Fixing color extraction from hardware bitmaps

Bug: 111343544
Change-Id: I624866e892465684871fbc130003e32945d86460
This commit is contained in:
Sunny Goyal
2018-11-29 12:13:47 -08:00
parent 6478d4f41b
commit b891eebbb5
6 changed files with 29 additions and 18 deletions
@@ -101,11 +101,11 @@ public class BaseIconFactory implements AutoCloseable {
}
public BitmapInfo createIconBitmap(Bitmap icon) {
if (mIconBitmapSize == icon.getWidth() && mIconBitmapSize == icon.getHeight()) {
return BitmapInfo.fromBitmap(icon);
if (mIconBitmapSize != icon.getWidth() || mIconBitmapSize != icon.getHeight()) {
icon = createIconBitmap(new BitmapDrawable(mContext.getResources(), icon), 1f);
}
return BitmapInfo.fromBitmap(
createIconBitmap(new BitmapDrawable(mContext.getResources(), icon), 1f));
return BitmapInfo.fromBitmap(icon, mDisableColorExtractor ? null : mColorExtractor);
}
public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,