diff options
author | Adam Cohen <adamcohen@google.com> | 2011-04-15 12:06:01 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-15 12:06:01 -0700 |
commit | b1c8befb2fc25e1a3c08d07bcea300fd22ede4e3 (patch) | |
tree | fed430588bbcb98f73c831f39739cb3e2ea57f0b /src/com/android/launcher2/FolderIcon.java | |
parent | 20ac28bacc93418f36563a563dc6a44cf014e840 (diff) | |
parent | df0353815c629fc678824b07a234b89a1ff94208 (diff) | |
download | android_packages_apps_Trebuchet-b1c8befb2fc25e1a3c08d07bcea300fd22ede4e3.tar.gz android_packages_apps_Trebuchet-b1c8befb2fc25e1a3c08d07bcea300fd22ede4e3.tar.bz2 android_packages_apps_Trebuchet-b1c8befb2fc25e1a3c08d07bcea300fd22ede4e3.zip |
Merge "Enabling user folder creation by dropping shortcut onto shortcut"
Diffstat (limited to 'src/com/android/launcher2/FolderIcon.java')
-rw-r--r-- | src/com/android/launcher2/FolderIcon.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java index bbc3409af..a64b550e1 100644 --- a/src/com/android/launcher2/FolderIcon.java +++ b/src/com/android/launcher2/FolderIcon.java @@ -77,6 +77,11 @@ public class FolderIcon extends BubbleTextView implements DropTarget { && item.container != mInfo.id; } + public void addItem(ShortcutInfo item) { + mInfo.add(item); + LauncherModel.addOrMoveItemInDatabase(mLauncher, item, mInfo.id, 0, 0, 0); + } + public void onDrop(DragSource source, int x, int y, int xOffset, int yOffset, DragView dragView, Object dragInfo) { ShortcutInfo item; @@ -86,8 +91,7 @@ public class FolderIcon extends BubbleTextView implements DropTarget { } else { item = (ShortcutInfo)dragInfo; } - mInfo.add(item); - LauncherModel.addOrMoveItemInDatabase(mLauncher, item, mInfo.id, 0, 0, 0); + addItem(item); } public void onDragEnter(DragSource source, int x, int y, int xOffset, int yOffset, |