diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-11 21:51:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-11 21:51:41 +0000 |
| commit | 1d7a55668e0a36a7ab150db2df4007dd5810bde8 (patch) | |
| tree | 117bd93616d3d6949f3dbc2bf74bcd8f12446fc9 /src/com | |
| parent | 485693c9eff4b10e7c9cd2dda1b78d0032b4eeac (diff) | |
| parent | ddc20bff8f09aadf65a3913ee56ff9a56e5beadc (diff) | |
| download | android_packages_apps_Trebuchet-1d7a55668e0a36a7ab150db2df4007dd5810bde8.tar.gz android_packages_apps_Trebuchet-1d7a55668e0a36a7ab150db2df4007dd5810bde8.tar.bz2 android_packages_apps_Trebuchet-1d7a55668e0a36a7ab150db2df4007dd5810bde8.zip | |
Merge "When updating an icon, keeping the drawable padding same as before" into ub-launcher3-burnaby
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 5c2121ab8..55deb8559 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -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) { |