diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-11-23 05:36:41 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-11-23 05:36:41 +0000 |
commit | 491bb699c841cfb9ce065230d88f00ee51675bad (patch) | |
tree | 12503ef307765de5f1711b5e26aa8e3220978f0f | |
parent | 75b7b9d35cb9981ad4867d55f15d0701a2bffab4 (diff) | |
parent | f58ba9ca79802f14d402fdef22f6319437e42e3b (diff) | |
download | packages_apps_Trebuchet-491bb699c841cfb9ce065230d88f00ee51675bad.tar.gz packages_apps_Trebuchet-491bb699c841cfb9ce065230d88f00ee51675bad.tar.bz2 packages_apps_Trebuchet-491bb699c841cfb9ce065230d88f00ee51675bad.zip |
Merge "Align badging logic with platform IconDrawableFactory." into ub-launcher3-qt-future-dev
-rw-r--r-- | iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java b/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java index f491ed73f..5c4f37ca9 100644 --- a/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java +++ b/iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java @@ -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) { |