summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPatrick Dubroy <dubroy@google.com>2010-07-14 18:29:09 (GMT)
committerPatrick Dubroy <dubroy@google.com>2010-07-14 18:29:09 (GMT)
commit379f16080fc37b02e048afa0cc54c605ba0ad37e (patch)
tree81788f7522313df074844b9791b8024fbbe7b842 /src
parent6d5c6ecb5f19966b8ff79fdf48d96bd00dc1dd91 (diff)
downloadandroid_packages_apps_Trebuchet-379f16080fc37b02e048afa0cc54c605ba0ad37e.zip
android_packages_apps_Trebuchet-379f16080fc37b02e048afa0cc54c605ba0ad37e.tar.gz
android_packages_apps_Trebuchet-379f16080fc37b02e048afa0cc54c605ba0ad37e.tar.bz2
fix 2841060: Folders appear to accept drag-and-drop of widgets
Change-Id: I6e408c25d52c8b3a5f64149326df901fce1ce597
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/FolderIcon.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java
index a09b6e0..78a9516 100644
--- a/src/com/android/launcher2/FolderIcon.java
+++ b/src/com/android/launcher2/FolderIcon.java
@@ -91,7 +91,9 @@ public class FolderIcon extends BubbleTextView implements DropTarget {
public void onDragEnter(DragSource source, int x, int y, int xOffset, int yOffset,
DragView dragView, Object dragInfo) {
- setCompoundDrawablesWithIntrinsicBounds(null, mOpenIcon, null, null);
+ if (acceptDrop(source, x, y, xOffset, yOffset, dragView, dragInfo)) {
+ setCompoundDrawablesWithIntrinsicBounds(null, mOpenIcon, null, null);
+ }
}
public void onDragOver(DragSource source, int x, int y, int xOffset, int yOffset,