commit 1d7a55668e0a36a7ab150db2df4007dd5810bde8
author Sunny Goyal <sunnygoyal@google.com> Mon May 11 21:51:36 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 11 21:51:41 2015 +0000
tree 117bd93616d3d6949f3dbc2bf74bcd8f12446fc9
parent 485693c9eff4b10e7c9cd2dda1b78d0032b4eeac
parent ddc20bff8f09aadf65a3913ee56ff9a56e5beadc

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

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 5c2121a..55deb85 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4185,7 +4185,7 @@
                             && 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 @@
                     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) {