commit 71538da6e2e70af15684cc270a6e67c9b5a010dc
author Tony Wickham <twickham@google.com> Thu Jul 28 00:29:45 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 28 00:29:45 2016 +0000
tree f18bee7e6b1b18da7e1e48569b638705ead59dad
parent e117f53f3667238b17093fbb217f6daf963e50d0
parent b9da46275bd3e7bcca7e9197d5e3486f0fe00f19

Merge "Cleanup deferred drag when closing deep shortcuts container." into ub-launcher3-calgary

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index f22219f..3f12abf 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);
         }