commit b9da46275bd3e7bcca7e9197d5e3486f0fe00f19
author Tony Wickham <twickham@google.com> Wed Jul 27 16:09:01 2016 -0700
committer Tony Wickham <twickham@google.com> Wed Jul 27 23:44:53 2016 +0000
tree 177d8ad776646983543e308dc2208208aac91842
parent 8fcdee05bb87fee8085048a27c954626d59dbb9b

Cleanup deferred drag when closing deep shortcuts container.

This fixes those states where a drag view dangles on the screen
forever until launcher restarts. For instance, long press
Settings and press home before letting go.

Bug: 30291280

Change-Id: Ib8c403a02a17f35ba170c21f78f41bdc3b48d096

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index deac73b..b00006f 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3132,6 +3132,7 @@
     public void closeShortcutsContainer() {
         DeepShortcutsContainer deepShortcutsContainer = getOpenShortcutsContainer();
         if (deepShortcutsContainer != null) {
+            deepShortcutsContainer.cleanupDeferredDrag(true);
             mDragController.removeDragListener(deepShortcutsContainer);
             mDragLayer.removeView(deepShortcutsContainer);
         }