diff options
author | Adam Cohen <adamcohen@google.com> | 2012-07-12 15:55:15 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-12 15:55:15 -0700 |
commit | c4890611ffb79a064fb722de3a704ff82ec35f1f (patch) | |
tree | 3e168a27db0104f0c777ad3ae81a132271f2f7a8 /src/com/android/launcher2 | |
parent | aae6989332f87c48dbc30a0f4e51cf70ddd2fd6f (diff) | |
parent | bb00ff2666d52a0df763a446ad3e398c643d23dd (diff) | |
download | android_packages_apps_Trebuchet-c4890611ffb79a064fb722de3a704ff82ec35f1f.tar.gz android_packages_apps_Trebuchet-c4890611ffb79a064fb722de3a704ff82ec35f1f.tar.bz2 android_packages_apps_Trebuchet-c4890611ffb79a064fb722de3a704ff82ec35f1f.zip |
Merge "Fix inconsistency when dropping to hotseat"
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 610b9a2e0..18374b246 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -2153,7 +2153,7 @@ public class Workspace extends SmoothPagedView // We want the point to be mapped to the dragTarget. if (dropTargetLayout != null) { if (mLauncher.isHotseatLayout(dropTargetLayout)) { - mapPointFromSelfToSibling(mLauncher.getHotseat(), mDragViewVisualCenter); + mapPointFromSelfToHotseatLayout(mLauncher.getHotseat(), mDragViewVisualCenter); } else { mapPointFromSelfToChild(dropTargetLayout, mDragViewVisualCenter, null); } |