From 544946ae80af996e6f13f559964fabb23e4feae4 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Wed, 21 Jun 2017 12:00:19 -0700 Subject: [PATCH] Set mDragInProcess to false in onDragEnd. Before this change, it was possible to touch (not drag and drop) a Folder and have it open to a non-first page. With this change, the Folder always opens to the first page on touch. For drag and drop, it will still open to the last page. Bug: 36022592 Change-Id: Ib0417eaf7e4866e874369b3b35248231a54cba06 --- src/com/android/launcher3/folder/Folder.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index 2838351532..b9632fba3b 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); }