commit ff35bf81a24812cb7dc33bbaddcfed1e44d418d2
author Adam Cohen <adamcohen@google.com> Sun Jul 17 12:56:20 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jul 17 12:56:20 2011 -0700
tree 34ecfceaa8af67111ef9a478a6be13c38a2e668f
parent 7494c5616630a11615f5ae8f05c02878eb866569
parent b7e1618c627c6471c565f4f599228648d9e70a10

Merge "Improving adding widgets animations"

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index d2da819..ec088d1 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -2072,8 +2072,8 @@
             boolean considerTimeout) {
         View dropOverView = target.getChildAt(targetCell[0], targetCell[1]);
 
-        boolean hasntMoved = mDragInfo != null
-                && (mDragInfo.cellX == targetCell[0] && mDragInfo.cellY == targetCell[1]);
+        boolean hasntMoved = mDragInfo != null && (mDragInfo.cellX == targetCell[0] &&
+                mDragInfo.cellY == targetCell[1]) && mDragInfo.screen == indexOfChild(target);
 
         if (dropOverView == null || hasntMoved || (considerTimeout && !mCreateUserFolderOnDrop)) {
             return false;