[automerger] Fix bug where add to folder fails even when folder creation animation runs. am: 36f6359c21

Change-Id: I2bfde2d4c4ef6030a9545d50afa379734b1346d9
2018-06-12 22:27:03 +00:00
parent a9d82c4591 36f6359c21
commit 8b64ab46c9
1 changed files with 6 additions and 1 deletions
@@ -2386,7 +2386,12 @@ public class Workspace extends PagedView<WorkspacePageIndicator>

    private void manageFolderFeedback(CellLayout targetLayout,
            int[] targetCell, float distance, DragObject dragObject) {
-        if (distance > mMaxDistanceForFolderCreation) return;
+        if (distance > mMaxDistanceForFolderCreation) {
+            if (mDragMode != DRAG_MODE_NONE) {
+                setDragMode(DRAG_MODE_NONE);
+            }
+            return;
+        }

        final View dragOverView = mDragTargetLayout.getChildAt(mTargetCell[0], mTargetCell[1]);
        ItemInfo info = dragObject.dragInfo;