summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-08-30 22:46:55 -0700
committerAdam Cohen <adamcohen@google.com>2011-08-30 22:46:55 -0700
commit2e9f4fb38e833b18fe403da17b00f830d6a5e86c (patch)
tree0562adf1de1fa18b8d5076c437171554709f73b6 /src
parent11ffa5ffb367bb4f62607d1cf5616909cf7d8b02 (diff)
downloadandroid_packages_apps_Trebuchet-2e9f4fb38e833b18fe403da17b00f830d6a5e86c.tar.gz
android_packages_apps_Trebuchet-2e9f4fb38e833b18fe403da17b00f830d6a5e86c.tar.bz2
android_packages_apps_Trebuchet-2e9f4fb38e833b18fe403da17b00f830d6a5e86c.zip
Fixing bug where workspace wouldn't accept drop
Change-Id: I23a4b70b42d2271afc12f9cb6ed429b6d320ebeb
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Workspace.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 4ed4495ba..633cbe525 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -2121,6 +2121,13 @@ public class Workspace extends SmoothPagedView
mDragViewVisualCenter = getDragViewVisualCenter(d.x, d.y, d.xOffset, d.yOffset,
d.dragView, mDragViewVisualCenter);
+ // We want the point to be mapped to the dragTarget.
+ if (mLauncher.isHotseatLayout(mDragTargetLayout)) {
+ mapPointFromSelfToSibling(mLauncher.getHotseat(), mDragViewVisualCenter);
+ } else {
+ mapPointFromSelfToChild(mDragTargetLayout, mDragViewVisualCenter, null);
+ }
+
int spanX = 1;
int spanY = 1;
View ignoreView = null;