commit 968c283f22201c27249fa1ce4c39e49876475519
author Tony Wickham <twickham@google.com> Thu Oct 27 21:05:52 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 27 21:05:52 2016 +0000
tree 8462eb975214cd0dc7ec50a0904722108cfb8853
parent 3ef8691f8294ad35f792a1b264ac5cfb6eb58cc2
parent 4feb27e6b1b548be7ed8abd7d76fd4d8d5dcfa6e

Merge "Restore mDragInfo when deferring onDropComplete() for uninstall." into ub-launcher3-master

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 3b9d690..2161e39 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3597,8 +3597,10 @@
     public void onDropCompleted(final View target, final DragObject d,
             final boolean isFlingToDelete, final boolean success) {
         if (mDeferDropAfterUninstall) {
+            final CellLayout.CellInfo dragInfo = mDragInfo;
             mDeferredAction = new Runnable() {
                 public void run() {
+                    mDragInfo = dragInfo; // Restore the drag info that was cleared in onDragEnd()
                     onDropCompleted(target, d, isFlingToDelete, success);
                     mDeferredAction = null;
                 }
@@ -3626,6 +3628,7 @@
                 && mDragInfo.cell != null) {
             mDragInfo.cell.setVisibility(VISIBLE);
         }
+        mDragInfo = null;
 
         if (!isFlingToDelete) {
             // Fling to delete already exits spring loaded mode after the animation finishes.