commit 39a37cc2fa836778cfe60bf24398d4e00ca25a54
author Tony Wickham <twickham@google.com> Thu Mar 08 16:56:20 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 08 16:56:20 2018 +0000
tree 78141a38a059d1c8c25c0bb82f68b05034aaa368
parent f2523dc8aa235528973fad747bb4f87148fefa96
parent 4d9103215d415f1ee7d9d878ffafcc1d678dda77

Merge "Show icon when drop on deferred drop target is canceled" 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 7c42b48..41d0cd8 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2970,8 +2970,9 @@
                         + "Workspace#onDropCompleted. Please file a bug. ");
             }
         }
-        if (d.cancelled && mDragInfo != null && mDragInfo.cell != null) {
-            mDragInfo.cell.setVisibility(VISIBLE);
+        View cell = getHomescreenIconByItemId(d.originalDragInfo.id);
+        if (d.cancelled && cell != null) {
+            cell.setVisibility(VISIBLE);
         }
         mDragInfo = null;
     }