Merge "Use the icon bounds for all calculations." into jb-ub-now-jolly-elf

diff --cc src/com/android/launcher3/Folder.java
Simple merge

diff --cc src/com/android/launcher3/Workspace.java
index 9b6784c,9f4f9d9..8ef0ff2
--- 1/src/com/android/launcher3/Workspace.java
--- 2/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@@ -2544,15 -2536,9 +2544,16 @@@ public class Workspace extends SmoothPa
              icon.clearPressedOrFocusedBackground();
          }
  
-         mDragController.startDrag(b, dragLayerX, dragLayerY, source, child.getTag(),
 +        if (child.getTag() == null || !(child.getTag() instanceof ItemInfo)) {
 +            String msg = "Drag started with a view that has no tag set. This "
 +                    + "will cause a crash (issue 11627249) down the line. "
 +                    + "View: " + child + "  tag: " + child.getTag();
 +            throw new IllegalStateException(msg);
 +        }
 +
+         DragView dv = mDragController.startDrag(b, dragLayerX, dragLayerY, source, child.getTag(),
                  DragController.DRAG_ACTION_MOVE, dragVisualizeOffset, dragRect, scale);
+         dv.setIntrinsicIconScaleFactor(source.getIntrinsicIconScaleFactor());
  
          if (child.getParent() instanceof ShortcutAndWidgetContainer) {
              mDragSourceInternal = (ShortcutAndWidgetContainer) child.getParent();