resolved conflicts for merge of 63aa4653 to ub-launcher3-master
Change-Id: I9fb7e452fdc646dc3d764d61d92755fa43edfa65
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index f299a45..281c253 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2325,15 +2325,15 @@
throw new IllegalStateException(msg);
}
+ if (child.getParent() instanceof ShortcutAndWidgetContainer) {
+ mDragSourceInternal = (ShortcutAndWidgetContainer) child.getParent();
+ }
+
DragView dv = mDragController.startDrag(b, dragLayerX, dragLayerY, source,
(ItemInfo) dragObject, DragController.DRAG_ACTION_MOVE, dragVisualizeOffset,
dragRect, scale, accessible);
dv.setIntrinsicIconScaleFactor(source.getIntrinsicIconScaleFactor());
- if (child.getParent() instanceof ShortcutAndWidgetContainer) {
- mDragSourceInternal = (ShortcutAndWidgetContainer) child.getParent();
- }
-
b.recycle();
}