commit 4c17d3ffec402db917170751ab45ca40a581c17a
author Tony Wickham <twickham@google.com> Thu Jul 28 00:46:02 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 28 00:46:02 2016 +0000
tree f18bee7e6b1b18da7e1e48569b638705ead59dad
parent 75b3394ba41ff2c94690394d223ff881037b75e2
parent b9da46275bd3e7bcca7e9197d5e3486f0fe00f19

Cleanup deferred drag when closing deep shortcuts container.
am: b9da46275b

Change-Id: I4f8c11fe12f4daf1c9fb446a936413b769b5de8e

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