commit 8b64ab46c9d30b232bbc8d161dbd371a7454aa9d
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Jun 12 22:27:03 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Jun 12 22:27:03 2018 +0000
tree 774b973154e42b4e5fca65e6f905f3551dc1d90e
parent a9d82c45911c30cce2921751b88f793bfc6617be
parent 36f6359c21075951a39a0b7168010ffc42dc58e0

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

Change-Id: I2bfde2d4c4ef6030a9545d50afa379734b1346d9

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;