commit 4d9103215d415f1ee7d9d878ffafcc1d678dda77
author Tony <twickham@google.com> Thu Mar 08 13:43:48 2018 +0000
committer Tony <twickham@google.com> Thu Mar 08 13:54:52 2018 +0000
tree a9cc886d522eb25d67d80352a50ed6df0ae5942f
parent b12ae37ffefd4f60996ea7f874cfefa70e10890e

Show icon when drop on deferred drop target is canceled

Before:
Drag to uninstall -> cancel -> icon stays hidden

Now the icon reappears.

Bug: 74356377
Change-Id: I7a69e583098bced31cf38af04dc9861dfa4118e2

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;
     }