commit c73a972ce917eef3bef5d8392d1fb77f7b5cd564
author Jonathan Miranda <jonmiranda@google.com> Thu Jun 14 23:14:15 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 14 23:14:15 2018 +0000
tree b8b94170507994e61c4e99c0edd328e6e65db6c1
parent 83e6107f1dfae8c0df2108fb7ff9e502f76c2516
parent 8b64ab46c9d30b232bbc8d161dbd371a7454aa9d

Merge changes from topic "am-a3d615af-02aa-451c-b89c-c1f59300b566" into ub-launcher3-master

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

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 3188e6e..abba9c4 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2387,7 +2387,12 @@
 
     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;