Merge "When updating an icon, keeping the drawable padding same as before" into ub-launcher3-burnaby

This commit is contained in:
Sunny Goyal
2015-05-11 21:51:36 +00:00
committed by Android (Google) Code Review
+2 -2
View File
@@ -4185,7 +4185,7 @@ public class Workspace extends SmoothPagedView
&& packageNames.contains(cn.getPackageName())) {
shortcutInfo.isDisabled |= reason;
BubbleTextView shortcut = (BubbleTextView) v;
shortcut.applyFromShortcutInfo(shortcutInfo, mIconCache, true, false);
shortcut.applyFromShortcutInfo(shortcutInfo, mIconCache, false);
if (parent != null) {
parent.invalidate();
@@ -4371,7 +4371,7 @@ public class Workspace extends SmoothPagedView
BubbleTextView shortcut = (BubbleTextView) v;
boolean oldPromiseState = getTextViewIcon(shortcut)
instanceof PreloadIconDrawable;
shortcut.applyFromShortcutInfo(si, mIconCache, true,
shortcut.applyFromShortcutInfo(si, mIconCache, false,
si.isPromise() != oldPromiseState);
if (parent != null) {