Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecf9bf46 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

resolved conflicts for merge of 63aa4653 to ub-launcher3-master

Change-Id: I9fb7e452fdc646dc3d764d61d92755fa43edfa65
parents 8382fdc7 63aa4653
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -2325,15 +2325,15 @@ public class Workspace extends PagedView
            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();
    }