From b9da46275bd3e7bcca7e9197d5e3486f0fe00f19 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 27 Jul 2016 16:09:01 -0700
Subject: [PATCH] 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 | 1 +
 1 file changed, 1 insertion(+)

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