commit cc1cfe4b0c521a2add64f851a32f39be2b0327a6
author Winson Chung <winsonc@google.com> Mon Jun 18 15:09:17 2012 -0700
committer Winson Chung <winsonc@google.com> Mon Jun 18 15:09:39 2012 -0700
tree b709a8ede5e6236cae447f240754268f4006f10d
parent e783cde98d59a2df1d4645f07b278322cab16ecb

Fixing issue where dropping items onto side pages might drop them two pages away. (Bug 6433177)

Change-Id: I7fa745c269e63d699671cdaf0b527f2675ce3081

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index e18d8ef..174d23b 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -2385,7 +2385,13 @@
         // Here we store the final page that will be dropped to, if the workspace in fact
         // receives the drop
         if (mInScrollArea) {
-            mDropToLayout = mDragOverlappingLayout;
+            if (isPageMoving()) {
+                // If the user drops while the page is scrolling, we should use that page as the
+                // destination instead of the page that is being hovered over.
+                mDropToLayout = (CellLayout) getPageAt(getNextPage());
+            } else {
+                mDropToLayout = mDragOverlappingLayout;
+            }
         } else {
             mDropToLayout = mDragTargetLayout;
         }