commit 3871e7268607f446ed25bf475d13e230e51c64c3
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 eb65a90a3d802e7d5d2d3a948c9a3ec419739e5b
parent 8d71d4904393e9342dcbeaf81c0c648a9aaad550
parent 36f6359c21075951a39a0b7168010ffc42dc58e0

Merge "Fix bug where add to folder fails even when folder creation animation runs." into ub-launcher3-edmonton-polish

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;