diff options
| author | Tony Wickham <twickham@google.com> | 2016-07-28 00:29:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-28 00:29:45 +0000 |
| commit | 71538da6e2e70af15684cc270a6e67c9b5a010dc (patch) | |
| tree | f18bee7e6b1b18da7e1e48569b638705ead59dad /src | |
| parent | e117f53f3667238b17093fbb217f6daf963e50d0 (diff) | |
| parent | b9da46275bd3e7bcca7e9197d5e3486f0fe00f19 (diff) | |
| download | android_packages_apps_Trebuchet-71538da6e2e70af15684cc270a6e67c9b5a010dc.tar.gz android_packages_apps_Trebuchet-71538da6e2e70af15684cc270a6e67c9b5a010dc.tar.bz2 android_packages_apps_Trebuchet-71538da6e2e70af15684cc270a6e67c9b5a010dc.zip | |
Merge "Cleanup deferred drag when closing deep shortcuts container." into ub-launcher3-calgary
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index f22219f78..3f12abfd4 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); } |