commit 48b77ee2fc9a5af809ef4a88cda2c6fdaee47c11
author Jon Miranda <jonmiranda@google.com> Wed Jun 21 23:37:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 21 23:37:12 2017 +0000
tree 8567de33a2a5a09b5ec44fb40700672dfebc5a38
parent 00e610f93c731d71c8a8424e52a723ef43236084
parent fa544965f31ccb303f0ed14d1125d9b338a30d40

Merge "Set mDragInProcess to false in onDragEnd." into ub-launcher3-dorval-polish
am: fa544965f3

Change-Id: Icc3bb9680d977f5d4cc4d435d37a87b7f7fa174f

src/com/android/launcher3/folder/Folder.java

diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 2838351..b9632fb 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -335,6 +335,7 @@
         if (mIsExternalDrag && mDragInProgress) {
             completeDragExit();
         }
+        mDragInProgress = false;
         mDragController.removeDragListener(this);
     }