commit a3b240d32bf9e65b4ba80b28ad28eef0a1fd677b
author Tony Wickham <twickham@google.com> Wed Sep 30 00:01:13 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 30 00:01:13 2015 +0000
tree 6084432ae633d73232bbe6bb76a0743fb09280c6
parent e872a420b6517c5613fba870f08494768c2f9536
parent 2516428710f13d5abc425c896151ad013267cc3d

Merge "Drags originating in Folder exit spring loaded mode when completed." into ub-launcher3-master

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 7f8917c..3f9ffea 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -883,6 +883,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 4a85a48..0db5f03 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3732,8 +3732,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);
+        }
     }
 
     /**