diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-01-18 11:30:23 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2017-01-18 11:30:59 -0800 |
| commit | 1b0726359b5157db8d3d96c52a37f05fce065618 (patch) | |
| tree | 976beb740a63b928e35c41d026d7ea5af00222f8 /src/com/android/launcher3/model | |
| parent | a3db1fc674ed9a09cf1fae880506673cb7d8f83f (diff) | |
| download | android_packages_apps_Trebuchet-1b0726359b5157db8d3d96c52a37f05fce065618.tar.gz android_packages_apps_Trebuchet-1b0726359b5157db8d3d96c52a37f05fce065618.tar.bz2 android_packages_apps_Trebuchet-1b0726359b5157db8d3d96c52a37f05fce065618.zip | |
Moving icon generation out of ShortcutInfo constructor so that it
can be created on the UI thread
Change-Id: If84e52041eb4ab20807f5cfd4b7f31d7b5f381ed
Diffstat (limited to 'src/com/android/launcher3/model')
| -rw-r--r-- | src/com/android/launcher3/model/ShortcutsChangedTask.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/model/UserLockStateChangedTask.java | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/launcher3/model/ShortcutsChangedTask.java b/src/com/android/launcher3/model/ShortcutsChangedTask.java index 67bec6437..ba7112fd9 100644 --- a/src/com/android/launcher3/model/ShortcutsChangedTask.java +++ b/src/com/android/launcher3/model/ShortcutsChangedTask.java @@ -24,6 +24,7 @@ import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherModel; import com.android.launcher3.LauncherSettings; import com.android.launcher3.ShortcutInfo; +import com.android.launcher3.graphics.LauncherIcons; import com.android.launcher3.shortcuts.DeepShortcutManager; import com.android.launcher3.shortcuts.ShortcutInfoCompat; import com.android.launcher3.util.MultiHashMap; @@ -87,6 +88,8 @@ public class ShortcutsChangedTask extends ExtendedModelTask { } for (ShortcutInfo shortcutInfo : shortcutInfos) { shortcutInfo.updateFromDeepShortcutInfo(fullDetails, context); + shortcutInfo.iconBitmap = + LauncherIcons.createShortcutIcon(fullDetails, context); updatedShortcutInfos.add(shortcutInfo); } } diff --git a/src/com/android/launcher3/model/UserLockStateChangedTask.java b/src/com/android/launcher3/model/UserLockStateChangedTask.java index a214a2915..25f2f9d50 100644 --- a/src/com/android/launcher3/model/UserLockStateChangedTask.java +++ b/src/com/android/launcher3/model/UserLockStateChangedTask.java @@ -25,6 +25,7 @@ import com.android.launcher3.LauncherModel; import com.android.launcher3.LauncherSettings; import com.android.launcher3.ShortcutInfo; import com.android.launcher3.compat.UserManagerCompat; +import com.android.launcher3.graphics.LauncherIcons; import com.android.launcher3.shortcuts.DeepShortcutManager; import com.android.launcher3.shortcuts.ShortcutInfoCompat; import com.android.launcher3.shortcuts.ShortcutKey; @@ -85,6 +86,7 @@ public class UserLockStateChangedTask extends ExtendedModelTask { } si.isDisabled &= ~ShortcutInfo.FLAG_DISABLED_LOCKED_USER; si.updateFromDeepShortcutInfo(shortcut, context); + si.iconBitmap = LauncherIcons.createShortcutIcon(shortcut, context); } else { si.isDisabled |= ShortcutInfo.FLAG_DISABLED_LOCKED_USER; } |