summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/DragLayer.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-08-03 17:06:35 -0700
committerWinson Chung <winsonc@google.com>2011-08-04 15:50:30 -0700
commitea359c6aee44c0fe3bb94f7002c3b49208b32b7f (patch)
treed8fc92f2dd3eff26415b0bc8855f7714f819bc1a /src/com/android/launcher2/DragLayer.java
parent459814b7e6d6c9bb6b0569dcedb455f6fab3aa9c (diff)
downloadandroid_packages_apps_Trebuchet-ea359c6aee44c0fe3bb94f7002c3b49208b32b7f.tar.gz
android_packages_apps_Trebuchet-ea359c6aee44c0fe3bb94f7002c3b49208b32b7f.tar.bz2
android_packages_apps_Trebuchet-ea359c6aee44c0fe3bb94f7002c3b49208b32b7f.zip
Grid spacing fixes
- Restoring old grid for widgets - Disabling ability to add widgets to hotseat - Updating holo colors - Updating assets Change-Id: I3a639f0afeca9463f8079eb8fbaedf295a41fa0f
Diffstat (limited to 'src/com/android/launcher2/DragLayer.java')
-rw-r--r--src/com/android/launcher2/DragLayer.java5
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()