diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2019-03-27 16:03:06 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2019-04-16 00:08:24 -0700 |
commit | 9589916418d8892fcd99b3abb9770ae83ebec7d8 (patch) | |
tree | ad71a549bf1538ed9980912f6912f93808a61218 /src/com/android/launcher3/LauncherModel.java | |
parent | 1f457ae87f05f76ead7f064e93e4473abe840828 (diff) | |
download | android_packages_apps_Trebuchet-9589916418d8892fcd99b3abb9770ae83ebec7d8.tar.gz android_packages_apps_Trebuchet-9589916418d8892fcd99b3abb9770ae83ebec7d8.tar.bz2 android_packages_apps_Trebuchet-9589916418d8892fcd99b3abb9770ae83ebec7d8.zip |
ShortcutInfo renamed to WorkspaceItemInfo
Will get rid of ShortcutInfoCompat in a follow up cl
Change-Id: I7d7d9c938635f59b216290ba28bea9d0e0721a7d
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
-rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index c559f2ba1..dfbe0fe01 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -149,7 +149,7 @@ public class LauncherModel extends BroadcastReceiver public void bindAppsAdded(IntArray newScreens, ArrayList<ItemInfo> addNotAnimated, ArrayList<ItemInfo> addAnimated); public void bindPromiseAppProgressUpdated(PromiseAppInfo app); - public void bindShortcutsChanged(ArrayList<ShortcutInfo> updated, UserHandle user); + public void bindWorkspaceItemsChanged(ArrayList<WorkspaceItemInfo> updated); public void bindWidgetsRestored(ArrayList<LauncherAppWidgetInfo> widgets); public void bindRestoreItemsChange(HashSet<ItemInfo> updates); public void bindWorkspaceComponentsRemoved(ItemInfoMatcher matcher); @@ -530,8 +530,8 @@ public class LauncherModel extends BroadcastReceiver } - public void updateAndBindShortcutInfo(final ShortcutInfo si, final ShortcutInfoCompat info) { - updateAndBindShortcutInfo(() -> { + public void updateAndBindWorkspaceItem(WorkspaceItemInfo si, ShortcutInfoCompat info) { + updateAndBindWorkspaceItem(() -> { si.updateFromDeepShortcutInfo(info, mApp.getContext()); LauncherIcons li = LauncherIcons.obtain(mApp.getContext()); si.applyFrom(li.createShortcutIcon(info)); @@ -543,15 +543,15 @@ public class LauncherModel extends BroadcastReceiver /** * Utility method to update a shortcut on the background thread. */ - public void updateAndBindShortcutInfo(final Supplier<ShortcutInfo> shortcutProvider) { + public void updateAndBindWorkspaceItem(final Supplier<WorkspaceItemInfo> itemProvider) { enqueueModelUpdateTask(new BaseModelUpdateTask() { @Override public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) { - ShortcutInfo info = shortcutProvider.get(); + WorkspaceItemInfo info = itemProvider.get(); getModelWriter().updateItemInDatabase(info); - ArrayList<ShortcutInfo> update = new ArrayList<>(); + ArrayList<WorkspaceItemInfo> update = new ArrayList<>(); update.add(info); - bindUpdatedShortcuts(update, info.user); + bindUpdatedWorkspaceItems(update); } }); } |