diff options
| author | Jonathan Miranda <jonmiranda@google.com> | 2018-06-14 23:14:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-14 23:14:15 +0000 |
| commit | 3871e7268607f446ed25bf475d13e230e51c64c3 (patch) | |
| tree | eb65a90a3d802e7d5d2d3a948c9a3ec419739e5b /src/com/android/launcher3/Workspace.java | |
| parent | 8d71d4904393e9342dcbeaf81c0c648a9aaad550 (diff) | |
| parent | 36f6359c21075951a39a0b7168010ffc42dc58e0 (diff) | |
| download | android_packages_apps_Trebuchet-3871e7268607f446ed25bf475d13e230e51c64c3.tar.gz android_packages_apps_Trebuchet-3871e7268607f446ed25bf475d13e230e51c64c3.tar.bz2 android_packages_apps_Trebuchet-3871e7268607f446ed25bf475d13e230e51c64c3.zip | |
Merge "Fix bug where add to folder fails even when folder creation animation runs." into ub-launcher3-edmonton-polish
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 3188e6ecb..abba9c490 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2387,7 +2387,12 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 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; |