summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2016-07-27 16:09:01 -0700
committerTony Wickham <twickham@google.com>2016-07-27 23:44:53 +0000
commitb9da46275bd3e7bcca7e9197d5e3486f0fe00f19 (patch)
tree177d8ad776646983543e308dc2208208aac91842 /src
parent8fcdee05bb87fee8085048a27c954626d59dbb9b (diff)
downloadandroid_packages_apps_Trebuchet-b9da46275bd3e7bcca7e9197d5e3486f0fe00f19.tar.gz
android_packages_apps_Trebuchet-b9da46275bd3e7bcca7e9197d5e3486f0fe00f19.tar.bz2
android_packages_apps_Trebuchet-b9da46275bd3e7bcca7e9197d5e3486f0fe00f19.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Launcher.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index deac73be8..b00006f42 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);
}