PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 5591454 from d0993b2b6c to qt-qpr1-release

Browse Source 
Change-Id: I68a61a81a3aa467e7655359e61a710c04edaa14d
This commit is contained in:
android-build-team Robot
2019-05-22 03:06:24 +00:00
parent 24d4813d5f d0993b2b6c
commit dbcc1f94ed
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java
+7 -10
View File
@@ -161,22 +161,19 @@ public class BaseIconFactory implements AutoCloseable {
mCanvas.setBitmap(null);
}
final Bitmap result;
if (user != null && !Process.myUserHandle().equals(user)) {
if (isInstantApp) {
badgeWithDrawable(bitmap, mContext.getDrawable(R.drawable.ic_instant_app_badge));
}
if (user != null) {
BitmapDrawable drawable = new FixedSizeBitmapDrawable(bitmap);
Drawable badged = mPm.getUserBadgedIcon(drawable, user);
if (badged instanceof BitmapDrawable) {
result = ((BitmapDrawable) badged).getBitmap();
bitmap = ((BitmapDrawable) badged).getBitmap();
} else {
result = createIconBitmap(badged, 1f);
bitmap = createIconBitmap(badged, 1f);
}
} else if (isInstantApp) {
badgeWithDrawable(bitmap, mContext.getDrawable(R.drawable.ic_instant_app_badge));
result = bitmap;
} else {
result = bitmap;
}
return BitmapInfo.fromBitmap(result, mDisableColorExtractor ? null : mColorExtractor);
return BitmapInfo.fromBitmap(bitmap, mDisableColorExtractor ? null : mColorExtractor);
}
public Bitmap createScaledBitmapWithoutShadow(Drawable icon, boolean shrinkNonAdaptiveIcons) {