summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/FolderIcon.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2012-04-04 12:47:08 -0700
committerAdam Cohen <adamcohen@google.com>2012-04-09 11:41:59 -0700
commitc6cc61d45836e4081920883cc4d448ccb0bb8417 (patch)
treeba762273155bf3ac209f14a75636738b162e2a6b /src/com/android/launcher2/FolderIcon.java
parentcffc0b9bee02d5ddd7930992adbd0c62a5ca7fc6 (diff)
downloadandroid_packages_apps_Trebuchet-c6cc61d45836e4081920883cc4d448ccb0bb8417.tar.gz
android_packages_apps_Trebuchet-c6cc61d45836e4081920883cc4d448ccb0bb8417.tar.bz2
android_packages_apps_Trebuchet-c6cc61d45836e4081920883cc4d448ccb0bb8417.zip
Cleanup and refactoring in relation to drag and drop
-> folder creation, adding to folders, reordering, switching pages -> ensuring parity of dragEnter and dragExit in cell layouts and workspace (neither were consistently getting an even number of each) -> actually enforced above with exceptions -- probably want to take these out, but maybe we can leave them in as warnings -> fixed bug with mapping points to hotseat -> fixes other bugs with drag and drop Change-Id: I564568f810f2784d122ec6135012b67c2e8e7551
Diffstat (limited to 'src/com/android/launcher2/FolderIcon.java')
-rw-r--r--src/com/android/launcher2/FolderIcon.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java
index c005edfcd..513fa6bea 100644
--- a/src/com/android/launcher2/FolderIcon.java
+++ b/src/com/android/launcher2/FolderIcon.java
@@ -325,7 +325,10 @@ public class FolderIcon extends LinearLayout implements FolderListener {
}
public void onDragExit(Object dragInfo) {
- if (!willAcceptItem((ItemInfo) dragInfo)) return;
+ onDragExit();
+ }
+
+ public void onDragExit() {
mFolderRingAnimator.animateToNaturalState();
}