commit 36f6359c21075951a39a0b7168010ffc42dc58e0
author Jon Miranda <jonmiranda@google.com> Tue Jun 12 15:05:12 2018 -0700
committer Jon Miranda <jonmiranda@google.com> Tue Jun 12 15:26:52 2018 -0700
tree 65031bc99b96182a0e38542ddf76ec52b5fb9fe0
parent 367a53ec13407231513521416392d2cd8144b9dd

Fix bug where add to folder fails even when folder creation animation runs.

If the distance > max distance for folder creation, we clear the drag mode
if it was previously set.

Bug: 78919972
Change-Id: Ibd456c0981ebb20958c54d21ba3996172d2dd554

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 66fb3c6..eafdecc 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2386,7 +2386,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;