diff options
author | Jon Miranda <jonmiranda@google.com> | 2017-06-21 12:00:19 -0700 |
---|---|---|
committer | Jon Miranda <jonmiranda@google.com> | 2017-06-21 12:00:19 -0700 |
commit | 544946ae80af996e6f13f559964fabb23e4feae4 (patch) | |
tree | a4b6a2c0700b85c7fc5313456ea5b97186654aee /src/com/android/launcher3/folder | |
parent | 990b319bf7747c395176df2cd2de5cd4b48f5663 (diff) | |
download | android_packages_apps_Trebuchet-544946ae80af996e6f13f559964fabb23e4feae4.tar.gz android_packages_apps_Trebuchet-544946ae80af996e6f13f559964fabb23e4feae4.tar.bz2 android_packages_apps_Trebuchet-544946ae80af996e6f13f559964fabb23e4feae4.zip |
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
Diffstat (limited to 'src/com/android/launcher3/folder')
-rw-r--r-- | src/com/android/launcher3/folder/Folder.java | 1 |
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); } |