From 36f6359c21075951a39a0b7168010ffc42dc58e0 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Tue, 12 Jun 2018 15:05:12 -0700
Subject: [PATCH] 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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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