summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/folder
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-06-21 23:33:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-21 23:33:32 +0000
commitfa544965f31ccb303f0ed14d1125d9b338a30d40 (patch)
tree01e25dda2f1e08e5d3a0bc842a9ee991b0ee0692 /src/com/android/launcher3/folder
parent318f567a849223284eecec761c23b41a3fd2e568 (diff)
parent544946ae80af996e6f13f559964fabb23e4feae4 (diff)
downloadandroid_packages_apps_Trebuchet-fa544965f31ccb303f0ed14d1125d9b338a30d40.tar.gz
android_packages_apps_Trebuchet-fa544965f31ccb303f0ed14d1125d9b338a30d40.tar.bz2
android_packages_apps_Trebuchet-fa544965f31ccb303f0ed14d1125d9b338a30d40.zip
Merge "Set mDragInProcess to false in onDragEnd." into ub-launcher3-dorval-polish
Diffstat (limited to 'src/com/android/launcher3/folder')
-rw-r--r--src/com/android/launcher3/folder/Folder.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 283835153..b9632fba3 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -335,6 +335,7 @@ public class Folder extends AbstractFloatingView implements DragSource, View.OnC
if (mIsExternalDrag && mDragInProgress) {
completeDragExit();
}
+ mDragInProgress = false;
mDragController.removeDragListener(this);
}