commit 8f87845a6a57f81a0dfc68df919d8bb639745ff5
author Jonathan Miranda <jonmiranda@google.com> Wed Aug 30 19:00:45 2017 +0000
committer Jonathan Miranda <jonmiranda@google.com> Wed Aug 30 19:00:45 2017 +0000
tree 0eea639010dd9a8fd084ab8cc93058edff9db159
parent 7379dbe01fcd726f4627a4e84ed0493fbb8c7110
parent 4f59381bc48651c4bb953aa49a2add2b5f6150f2

[automerger] Fix bug where dragging app from Search breaks Folder preview. am: 4f59381bc4

Change-Id: I2840d69d93cf63483e6611c6ef7e64d1ca1419f1

src/com/android/launcher3/folder/FolderIcon.java

diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 6533b04..8339bc5 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -61,6 +61,7 @@
 import com.android.launcher3.badge.BadgeRenderer;
 import com.android.launcher3.badge.FolderBadgeInfo;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.dragndrop.BaseItemDragListener;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.dragndrop.DragView;
 import com.android.launcher3.graphics.IconPalette;
@@ -375,6 +376,9 @@
         if (d.dragInfo instanceof AppInfo) {
             // Came from all apps -- make a copy
             item = ((AppInfo) d.dragInfo).makeShortcut();
+        } else if (d.dragSource instanceof BaseItemDragListener){
+            // Came from a different window -- make a copy
+            item = new ShortcutInfo((ShortcutInfo) d.dragInfo);
         } else {
             item = (ShortcutInfo) d.dragInfo;
         }