commit 224f58c4bc9516fd67e77ae42cb084b8c357c3a7
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 20 21:38:09 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 20 21:38:09 2018 +0000
tree 31e071476879f64e468d9b1493a8f13927882a36
parent 68cc1f29a1aed90c5050a5aa5f95faad8460560a
parent 4685965355577c3d08f3d9f4bd4d9cdff1245679

Merge "Create new ShortcutInfo when dropping predicted deep shortcuts." into ub-launcher3-master

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 0b11707..11523a5 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2716,10 +2716,16 @@
             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;