From 2516428710f13d5abc425c896151ad013267cc3d Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Thu, 17 Sep 2015 14:06:31 -0700 Subject: [PATCH] Drags originating in Folder exit spring loaded mode when completed. Change-Id: Id020473a7a466fa98897455f48d3de7a3bc4997d --- src/com/android/launcher3/Folder.java | 5 +++++ src/com/android/launcher3/Workspace.java | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index ff21be2182..e7b19022e2 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -878,6 +878,11 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList mInfo.setOption(FolderInfo.FLAG_MULTI_PAGE_ANIMATION, false, mLauncher); } + if (!isFlingToDelete) { + // Fling to delete already exits spring loaded mode after the animation finishes. + mLauncher.exitSpringLoadedDragModeDelayed(successfulDrop, + Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null); + } } @Override diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 0fe37deb3c..9c726b149c 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -3739,8 +3739,11 @@ public class Workspace extends PagedView mDragOutline = null; mDragInfo = null; - mLauncher.exitSpringLoadedDragModeDelayed(success, - Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null); + if (!isFlingToDelete) { + // Fling to delete already exits spring loaded mode after the animation finishes. + mLauncher.exitSpringLoadedDragModeDelayed(success, + Launcher.EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT, null); + } } /**