diff options
| author | Tony Wickham <twickham@google.com> | 2017-07-29 01:16:13 +0000 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2017-07-29 01:16:13 +0000 |
| commit | ffea4cbf0ddd8bf758d61ab0af1848a2b296fefb (patch) | |
| tree | 69d216c0dff82435b832a86a03a312da69537464 /src/com/android/launcher3/model | |
| parent | a6c78b2c55c5acc84a49946bbd82adbcd360a519 (diff) | |
| parent | a8ccf0959754907de6aec63a41db5dc442047b80 (diff) | |
| download | android_packages_apps_Trebuchet-ffea4cbf0ddd8bf758d61ab0af1848a2b296fefb.tar.gz android_packages_apps_Trebuchet-ffea4cbf0ddd8bf758d61ab0af1848a2b296fefb.tar.bz2 android_packages_apps_Trebuchet-ffea4cbf0ddd8bf758d61ab0af1848a2b296fefb.zip | |
[automerger] Use deep shortcuts' icons as a fallback when updating am: a8ccf09597
Change-Id: I6629a5ca0eed641fc575b67dda39ff63b568f71b
Diffstat (limited to 'src/com/android/launcher3/model')
| -rw-r--r-- | src/com/android/launcher3/model/ShortcutsChangedTask.java | 6 | ||||
| -rw-r--r-- | src/com/android/launcher3/model/UserLockStateChangedTask.java | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/launcher3/model/ShortcutsChangedTask.java b/src/com/android/launcher3/model/ShortcutsChangedTask.java index 6f325858d..17cc238d4 100644 --- a/src/com/android/launcher3/model/ShortcutsChangedTask.java +++ b/src/com/android/launcher3/model/ShortcutsChangedTask.java @@ -85,10 +85,10 @@ public class ShortcutsChangedTask extends BaseModelUpdateTask { removedShortcutInfos.addAll(shortcutInfos); continue; } - for (ShortcutInfo shortcutInfo : shortcutInfos) { + for (final ShortcutInfo shortcutInfo : shortcutInfos) { shortcutInfo.updateFromDeepShortcutInfo(fullDetails, context); - shortcutInfo.iconBitmap = - LauncherIcons.createShortcutIcon(fullDetails, context); + shortcutInfo.iconBitmap = LauncherIcons.createShortcutIcon(fullDetails, context, + shortcutInfo.iconBitmap); updatedShortcutInfos.add(shortcutInfo); } } diff --git a/src/com/android/launcher3/model/UserLockStateChangedTask.java b/src/com/android/launcher3/model/UserLockStateChangedTask.java index 568200646..802771f04 100644 --- a/src/com/android/launcher3/model/UserLockStateChangedTask.java +++ b/src/com/android/launcher3/model/UserLockStateChangedTask.java @@ -85,7 +85,8 @@ public class UserLockStateChangedTask extends BaseModelUpdateTask { } si.isDisabled &= ~ShortcutInfo.FLAG_DISABLED_LOCKED_USER; si.updateFromDeepShortcutInfo(shortcut, context); - si.iconBitmap = LauncherIcons.createShortcutIcon(shortcut, context); + si.iconBitmap = LauncherIcons.createShortcutIcon(shortcut, context, + si.iconBitmap); } else { si.isDisabled |= ShortcutInfo.FLAG_DISABLED_LOCKED_USER; } |