diff options
| author | Jonathan Miranda <jonmiranda@google.com> | 2017-08-30 19:00:45 +0000 |
|---|---|---|
| committer | Jonathan Miranda <jonmiranda@google.com> | 2017-08-30 19:00:45 +0000 |
| commit | 8f87845a6a57f81a0dfc68df919d8bb639745ff5 (patch) | |
| tree | 0eea639010dd9a8fd084ab8cc93058edff9db159 /src/com | |
| parent | 7379dbe01fcd726f4627a4e84ed0493fbb8c7110 (diff) | |
| parent | 4f59381bc48651c4bb953aa49a2add2b5f6150f2 (diff) | |
| download | android_packages_apps_Trebuchet-8f87845a6a57f81a0dfc68df919d8bb639745ff5.tar.gz android_packages_apps_Trebuchet-8f87845a6a57f81a0dfc68df919d8bb639745ff5.tar.bz2 android_packages_apps_Trebuchet-8f87845a6a57f81a0dfc68df919d8bb639745ff5.zip | |
[automerger] Fix bug where dragging app from Search breaks Folder preview. am: 4f59381bc4
Change-Id: I2840d69d93cf63483e6611c6ef7e64d1ca1419f1
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/folder/FolderIcon.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java index 6533b0463..8339bc5b8 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.Workspace; 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 @@ public class FolderIcon extends FrameLayout implements FolderListener { 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; } |