Use the icon bounds for all calculations.
- Fixes a drag and drop issue when the dynamic grid scales icons down, due to the drawable bounds not being equal to their bitmap sizes. Change-Id: If7c68b51131de7bac3195a2619e22340f7789432
This commit is contained in:
1 parent
e248b83797
commit
eeb5bbc940
8 files changed
+50
-28
No files matched your search
@@ -522,14 +522,18 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
|
||||
scale *= childScale;
|
||||
int toX = coord[0];
|
||||
int toY = coord[1];
|
||||
float toScale = scale;
|
||||
if (child instanceof TextView) {
|
||||
TextView tv = (TextView) child;
|
||||
// Account for the source scale of the icon (ie. from AllApps to Workspace, in which
|
||||
// the workspace may have smaller icon bounds).
|
||||
toScale = scale / dragView.getIntrinsicIconScaleFactor();
|
||||
|
||||
// The child may be scaled (always about the center of the view) so to account for it,
|
||||
// we have to offset the position by the scaled size. Once we do that, we can center
|
||||
// the drag view about the scaled child view.
|
||||
toY += Math.round(scale * tv.getPaddingTop());
|
||||
toY -= dragView.getMeasuredHeight() * (1 - scale) / 2;
|
||||
toY += Math.round(toScale * tv.getPaddingTop());
|
||||
toY -= dragView.getMeasuredHeight() * (1 - toScale) / 2;
|
||||
toX -= (dragView.getMeasuredWidth() - Math.round(scale * child.getMeasuredWidth())) / 2;
|
||||
} else if (child instanceof FolderIcon) {
|
||||
// Account for holographic blur padding on the drag view
|
||||
@@ -555,7 +559,7 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
|
||||
}
|
||||
}
|
||||
};
|
||||
animateViewIntoPosition(dragView, fromX, fromY, toX, toY, 1, 1, 1, scale, scale,
|
||||
animateViewIntoPosition(dragView, fromX, fromY, toX, toY, 1, 1, 1, toScale, toScale,
|
||||
onCompleteRunnable, ANIMATION_END_DISAPPEAR, duration, anchorView);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user