diff options
author | Adam Cohen <adamcohen@google.com> | 2014-02-07 16:34:51 -0800 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 22:54:28 -0700 |
commit | ea73be5c71ae091a5acded5df9acbf2038bcac45 (patch) | |
tree | c12deb026b53d5310177b687a52d06c332258a2f | |
parent | 3f2ae36a8778309b9479cc8c90a474b885746910 (diff) | |
download | android_packages_apps_Trebuchet-ea73be5c71ae091a5acded5df9acbf2038bcac45.tar.gz android_packages_apps_Trebuchet-ea73be5c71ae091a5acded5df9acbf2038bcac45.tar.bz2 android_packages_apps_Trebuchet-ea73be5c71ae091a5acded5df9acbf2038bcac45.zip |
Fix NPE in when dropping from all apps (issue 12917451)
When dropping from all apps, accept drop was returning true if the item
was above a folder, however, when it came time to complete the drop,
the folder wouldn't accept the item. This can be prevented by increasing
the criteria in acceptDrop.
Change-Id: Ib644ec45984e8366c33bb674f3d3a76e22ed5160
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index d2586e764..ba3301d27 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2849,12 +2849,13 @@ public class Workspace extends SmoothPagedView mTargetCell); float distance = dropTargetLayout.getDistanceFromCell(mDragViewVisualCenter[0], mDragViewVisualCenter[1], mTargetCell); - if (willCreateUserFolder((ItemInfo) d.dragInfo, dropTargetLayout, - mTargetCell, distance, true)) { + if (mCreateUserFolderOnDrop && willCreateUserFolder((ItemInfo) d.dragInfo, + dropTargetLayout, mTargetCell, distance, true)) { return true; } - if (willAddToExistingUserFolder((ItemInfo) d.dragInfo, dropTargetLayout, - mTargetCell, distance)) { + + if (mAddToExistingFolderOnDrop && willAddToExistingUserFolder((ItemInfo) d.dragInfo, + dropTargetLayout, mTargetCell, distance)) { return true; } |