diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-05-17 15:28:41 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-05-17 15:29:44 -0700 |
commit | fbf327f9ee569ba8e48ce477e25c83ebac0b3b90 (patch) | |
tree | a2bce1037c0657fd941024b6c69dca9b99eba473 | |
parent | 48059dc7061b3144ba0b2f49d4ac4da7f7471752 (diff) | |
download | android_packages_apps_Trebuchet-fbf327f9ee569ba8e48ce477e25c83ebac0b3b90.tar.gz android_packages_apps_Trebuchet-fbf327f9ee569ba8e48ce477e25c83ebac0b3b90.tar.bz2 android_packages_apps_Trebuchet-fbf327f9ee569ba8e48ce477e25c83ebac0b3b90.zip |
Skip processing fallback icons as they are already badged and have shadow
Bug: 79496830
Change-Id: I3e601fda570eefdb277bfd50c846c5a2864f4b3a
-rw-r--r-- | src/com/android/launcher3/graphics/LauncherIcons.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/launcher3/graphics/LauncherIcons.java b/src/com/android/launcher3/graphics/LauncherIcons.java index 3b5585bcf..f020d2d7c 100644 --- a/src/com/android/launcher3/graphics/LauncherIcons.java +++ b/src/com/android/launcher3/graphics/LauncherIcons.java @@ -360,16 +360,18 @@ public class LauncherIcons implements AutoCloseable { .getShortcutIconDrawable(shortcutInfo, mFillResIconDpi); IconCache cache = LauncherAppState.getInstance(mContext).getIconCache(); - Bitmap unbadgedBitmap = null; + final Bitmap unbadgedBitmap; if (unbadgedDrawable != null) { unbadgedBitmap = createScaledBitmapWithoutShadow(unbadgedDrawable, 0); } else { if (fallbackIconProvider != null) { - unbadgedBitmap = fallbackIconProvider.get(); - } - if (unbadgedBitmap == null) { - unbadgedBitmap = cache.getDefaultIcon(Process.myUserHandle()).icon; + // Fallback icons are already badged and with appropriate shadow + Bitmap fullIcon = fallbackIconProvider.get(); + if (fullIcon != null) { + return createIconBitmap(fullIcon); + } } + unbadgedBitmap = cache.getDefaultIcon(Process.myUserHandle()).icon; } BitmapInfo result = new BitmapInfo(); |