diff options
author | Winson Chung <winsonc@google.com> | 2011-08-04 16:14:13 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-04 16:14:13 -0700 |
commit | 02765c94268d7dc3531c87a638a184a3b481ad40 (patch) | |
tree | ec93521963249345489e0bc1cf3a1f7b52291b8e /src/com/android/launcher2/DragLayer.java | |
parent | 7bdb25a9894970da74248c9cdc606d0e1ba05c99 (diff) | |
parent | ea359c6aee44c0fe3bb94f7002c3b49208b32b7f (diff) | |
download | android_packages_apps_Trebuchet-02765c94268d7dc3531c87a638a184a3b481ad40.tar.gz android_packages_apps_Trebuchet-02765c94268d7dc3531c87a638a184a3b481ad40.tar.bz2 android_packages_apps_Trebuchet-02765c94268d7dc3531c87a638a184a3b481ad40.zip |
Merge "Grid spacing fixes"
Diffstat (limited to 'src/com/android/launcher2/DragLayer.java')
-rw-r--r-- | src/com/android/launcher2/DragLayer.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java index 7fbde5471..d0d4bad6e 100644 --- a/src/com/android/launcher2/DragLayer.java +++ b/src/com/android/launcher2/DragLayer.java @@ -375,6 +375,11 @@ public class DragLayer extends FrameLayout { toY -= (dragView.getHeight() - (int) Math.round(scale * d.getIntrinsicHeight())) / 2; // Center in the x coordinate about the target's drawable toX -= (dragView.getMeasuredWidth() - Math.round(scale * child.getMeasuredWidth())) / 2; + } else if (child instanceof FolderIcon) { + // Account for holographic blur padding on the drag view + toY -= HolographicOutlineHelper.MAX_OUTER_BLUR_RADIUS / 2; + // Center in the x coordinate about the target's drawable + toX -= (dragView.getMeasuredWidth() - Math.round(scale * child.getMeasuredWidth())) / 2; } else { toY -= (Math.round(scale * (dragView.getHeight() - child.getMeasuredHeight()))) / 2; toX -= (Math.round(scale * (dragView.getMeasuredWidth() |