diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-02-20 21:38:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-02-20 21:38:09 +0000 |
| commit | 224f58c4bc9516fd67e77ae42cb084b8c357c3a7 (patch) | |
| tree | 31e071476879f64e468d9b1493a8f13927882a36 /src | |
| parent | 68cc1f29a1aed90c5050a5aa5f95faad8460560a (diff) | |
| parent | 4685965355577c3d08f3d9f4bd4d9cdff1245679 (diff) | |
| download | android_packages_apps_Trebuchet-224f58c4bc9516fd67e77ae42cb084b8c357c3a7.tar.gz android_packages_apps_Trebuchet-224f58c4bc9516fd67e77ae42cb084b8c357c3a7.tar.bz2 android_packages_apps_Trebuchet-224f58c4bc9516fd67e77ae42cb084b8c357c3a7.zip | |
Merge "Create new ShortcutInfo when dropping predicted deep shortcuts." into ub-launcher3-master
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 0b117075a..11523a516 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2716,10 +2716,16 @@ public class Workspace extends PagedView<WorkspacePageIndicator> case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION: case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT: case LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT: - if (info.container == NO_ID && info instanceof AppInfo) { + if (info.container == NO_ID) { // Came from all apps -- make a copy - info = ((AppInfo) info).makeShortcut(); - d.dragInfo = info; + if (info instanceof AppInfo) { + info = ((AppInfo) info).makeShortcut(); + d.dragInfo = info; + } else if (info instanceof ShortcutInfo) { + info = new ShortcutInfo((ShortcutInfo) info); + d.dragInfo = info; + } + } view = mLauncher.createShortcut(cellLayout, (ShortcutInfo) info); break; |