From 4d9103215d415f1ee7d9d878ffafcc1d678dda77 Mon Sep 17 00:00:00 2001
From: Tony <twickham@google.com>
Date: Thu, 8 Mar 2018 13:43:48 +0000
Subject: [PATCH] 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 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 7c42b4800c..41d0cd8bc5 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2970,8 +2970,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                         + "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;
     }