diff options
Diffstat (limited to 'src/com/android/launcher2/DragLayer.java')
| -rw-r--r-- | src/com/android/launcher2/DragLayer.java | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java index 379e59976..b31666571 100644 --- a/src/com/android/launcher2/DragLayer.java +++ b/src/com/android/launcher2/DragLayer.java @@ -462,20 +462,7 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang float scale = getDescendantCoordRelativeToSelf((View) child.getParent(), coord); int toX = coord[0]; int toY = coord[1]; - if (child instanceof TextView) { - float childrenScale = parent.getChildrenScale(); - TextView tv = (TextView) child; - - // 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(((1f - childrenScale) * child.getMeasuredHeight()) / 2 + - scale * childrenScale * tv.getPaddingTop()); - toY -= dragView.getMeasuredHeight() * (1 - scale * childrenScale) / 2; - toX -= (dragView.getMeasuredWidth() - Math.round(scale * child.getMeasuredWidth())) / 2; - - scale *= childrenScale; - } else if (child instanceof FolderIcon) { + if (child instanceof FolderIcon) { // Account for holographic blur padding on the drag view toY -= Workspace.DRAG_BITMAP_PADDING / 2; // Center in the x coordinate about the target's drawable |