commit 3c74c61916b5571e0e41383bca5258c7a29c9d80
author Adam Cohen <adamcohen@google.com> Fri Feb 07 16:41:08 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 07 16:41:08 2014 -0800
tree 9e784a431ff9a49409dca9a333c46ebe82f63cc0
parent a04417a07df0851e2d4da1b1374917df74ccd12b
parent ec0d61d79ef50010660b426b259a8ccb14656b31

am ec0d61d7: Fix NPE in when dropping from all apps (issue 12917451)

* commit 'ec0d61d79ef50010660b426b259a8ccb14656b31':
  Fix NPE in when dropping from all apps (issue 12917451)

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 0a7088d..50d29ed 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2709,12 +2709,13 @@
                     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;
             }