Drags originating in Folder exit spring loaded mode when completed.

Change-Id: Id020473a7a466fa98897455f48d3de7a3bc4997d
2015-09-17 14:06:31 -07:00
parent f519a039b2
commit 2516428710
2 changed files with 10 additions and 2 deletions
@@ -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);
+        }
    }

    /**