Merge "Align badging logic with platform IconDrawableFactory." into ub-launcher3-qt-future-dev (491bb699) · Commits · e / os / BlissLauncher3

iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java

+7 −10

Original line number	Diff line number	Diff line
		@@ -171,22 +171,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) {