summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2012-05-29 17:56:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-29 17:56:10 -0700
commit725c873c0340bd92f805bc4a365214ff118b0bb0 (patch)
tree2852e52ede92b2cc9336c18ef3a22294aaf8818a
parentce191808511599fc55f95b8a75a10cbba4b1b2ae (diff)
parent7afa902b6cf1b63aa145ec95bc62757b4f680abd (diff)
downloadandroid_packages_apps_Trebuchet-725c873c0340bd92f805bc4a365214ff118b0bb0.tar.gz
android_packages_apps_Trebuchet-725c873c0340bd92f805bc4a365214ff118b0bb0.tar.bz2
android_packages_apps_Trebuchet-725c873c0340bd92f805bc4a365214ff118b0bb0.zip
am 7afa902b: Fix issue where item gets added to folder when displacing folder (issue 6576460)
* commit '7afa902b6cf1b63aa145ec95bc62757b4f680abd': Fix issue where item gets added to folder when displacing folder (issue 6576460)
-rw-r--r--src/com/android/launcher2/Workspace.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index e90673398..ba518890e 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -2839,7 +2839,6 @@ public class Workspace extends SmoothPagedView
if (willAddToFolder && mDragMode == DRAG_MODE_NONE) {
mDragOverFolderIcon = ((FolderIcon) dragOverView);
- mAddToExistingFolderOnDrop = true;
mDragOverFolderIcon.onDragEnter(info);
if (targetLayout != null) {
targetLayout.clearDragOutlines();