commit 8d0417afcfb137b9114c24a8145f9fe18053b855
author Adam Cohen <adamcohen@google.com> Thu Sep 29 17:42:06 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 29 17:42:06 2011 -0700
tree bac89b3841ec196aa3015fdea3dbfa06c996a6a4
parent 750214c5eeb71d21d0be7c5bf41ba49232afb931
parent 36cc09b07b19198f4ea886583cef462ade27192c

am 36cc09b0: Fixing issue with cancelled drag blocking cell spaces (Issue 5386523)

* commit '36cc09b07b19198f4ea886583cef462ade27192c':
  Fixing issue with cancelled drag blocking cell spaces (Issue 5386523)

src/com/android/launcher2/DragController.java

diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index afbf80d..ca7e55b 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -361,6 +361,7 @@
             if (mLastDropTarget != null) {
                 mLastDropTarget.onDragExit(mDragObject);
             }
+            mDragObject.cancelled = true;
             mDragObject.dragComplete = true;
             mDragObject.dragSource.onDropCompleted(null, mDragObject, false);
         }

src/com/android/launcher2/DropTarget.java

diff --git a/src/com/android/launcher2/DropTarget.java b/src/com/android/launcher2/DropTarget.java
index 34fa893..4172da2 100644
--- a/src/com/android/launcher2/DropTarget.java
+++ b/src/com/android/launcher2/DropTarget.java
@@ -52,6 +52,9 @@
         /** Post drag animation runnable */
         public Runnable postAnimationRunnable = null;
 
+        /** Indicates that the drag operation was cancelled */
+        public boolean cancelled = false;
+
         public DragObject() {
         }
     }

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 44c533b..873c038 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -3051,6 +3051,9 @@
             }
             cellLayout.onDropChild(mDragInfo.cell);
         }
+        if (d.cancelled &&  mDragInfo.cell != null) {
+                mDragInfo.cell.setVisibility(VISIBLE);
+        }
         mDragOutline = null;
         mDragInfo = null;
     }