commit 2516428710f13d5abc425c896151ad013267cc3d
author Tony Wickham <twickham@google.com> Thu Sep 17 14:06:31 2015 -0700
committer Tony Wickham <twickham@google.com> Fri Sep 18 15:30:24 2015 -0700
tree 2bc3ca75b83ee6b02d795dc0dfbac1f365c095eb
parent f519a039b293a23dcc1bf6f9352fe62ada1106f2

Drags originating in Folder exit spring loaded mode when completed.

Change-Id: Id020473a7a466fa98897455f48d3de7a3bc4997d

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index ff21be2..e7b1902 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -878,6 +878,11 @@
             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

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 0fe37de..9c726b1 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3739,8 +3739,11 @@
         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);
+        }
     }
 
     /**