From 379f16080fc37b02e048afa0cc54c605ba0ad37e Mon Sep 17 00:00:00 2001 From: Patrick Dubroy Date: Wed, 14 Jul 2010 11:29:09 -0700 Subject: fix 2841060: Folders appear to accept drag-and-drop of widgets Change-Id: I6e408c25d52c8b3a5f64149326df901fce1ce597 --- src/com/android/launcher2/FolderIcon.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java index a09b6e045..78a9516f6 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, -- cgit v1.2.3