summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-07-15 18:19:15 -0700
committerAdam Cohen <adamcohen@google.com>2011-07-15 18:19:15 -0700
commit7494c5616630a11615f5ae8f05c02878eb866569 (patch)
tree7fc9dfd3fbc543924cd5abc8aefdc56797f730b8
parentd8d375d99a844bd521e79b47195785e4f28c34cf (diff)
downloadpackages_apps_trebuchet-7494c5616630a11615f5ae8f05c02878eb866569.zip
packages_apps_trebuchet-7494c5616630a11615f5ae8f05c02878eb866569.tar.gz
packages_apps_trebuchet-7494c5616630a11615f5ae8f05c02878eb866569.tar.bz2
Fix folder creation bug 5037239
Change-Id: I0e629b186c94ca3ccaa188de94846d2bbbca83a4
-rw-r--r--src/com/android/launcher2/Workspace.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index f8e3f5a..eeb5534 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -2072,8 +2072,8 @@ public class Workspace extends SmoothPagedView
boolean considerTimeout) {
View dropOverView = target.getChildAt(targetCell[0], targetCell[1]);
- boolean hasntMoved = mDragInfo != null
- && (mDragInfo.cellX == targetCell[0] && mDragInfo.cellY == targetCell[1]);
+ boolean hasntMoved = mDragInfo != null && (mDragInfo.cellX == targetCell[0] &&
+ mDragInfo.cellY == targetCell[1]) && mDragInfo.screen == indexOfChild(target);
if (dropOverView == null || hasntMoved || (considerTimeout && !mCreateUserFolderOnDrop)) {
return false;