diff options
author | Adam Cohen <adamcohen@google.com> | 2011-05-24 14:07:08 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2011-05-24 16:17:13 -0700 |
commit | cb3382b1bfe1a534b1b44f5c4def9b2db605ac90 (patch) | |
tree | 7f1b1e4538e0143f713582b055530d1a53f03499 /src/com/android/launcher2/FolderIcon.java | |
parent | 7d7207f6bca8584c28c8b0b6586f262e543f2d68 (diff) | |
download | android_packages_apps_Trebuchet-cb3382b1bfe1a534b1b44f5c4def9b2db605ac90.tar.gz android_packages_apps_Trebuchet-cb3382b1bfe1a534b1b44f5c4def9b2db605ac90.tar.bz2 android_packages_apps_Trebuchet-cb3382b1bfe1a534b1b44f5c4def9b2db605ac90.zip |
Refactor of Launcher drag and drop to use a DragObject
-> DragObject contains a bunch of parameters instead of pssing
them each individually
Change-Id: I709cf320fe4234d71e19325d5c761dd9a9bba405
Diffstat (limited to 'src/com/android/launcher2/FolderIcon.java')
-rw-r--r-- | src/com/android/launcher2/FolderIcon.java | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java index 2a5a5a0cf..0091a28ab 100644 --- a/src/com/android/launcher2/FolderIcon.java +++ b/src/com/android/launcher2/FolderIcon.java @@ -58,8 +58,6 @@ public class FolderIcon extends FrameLayout implements DropTarget, FolderListene private int mOriginalWidth = -1; private int mOriginalHeight = -1; - private int mOriginalX = -1; - private int mOriginalY = -1; private int mFolderLocX; private int mFolderLocY; @@ -121,9 +119,8 @@ public class FolderIcon extends FrameLayout implements DropTarget, FolderListene !mFolder.isFull() && item != mInfo); } - public boolean acceptDrop(DragSource source, int x, int y, int xOffset, int yOffset, - DragView dragView, Object dragInfo) { - final ItemInfo item = (ItemInfo) dragInfo; + public boolean acceptDrop(DragObject d) { + final ItemInfo item = (ItemInfo) d.dragInfo; return willAcceptItem(item); } @@ -132,14 +129,13 @@ public class FolderIcon extends FrameLayout implements DropTarget, FolderListene LauncherModel.addOrMoveItemInDatabase(mLauncher, item, mInfo.id, 0, item.cellX, item.cellY); } - public void onDrop(DragSource source, int x, int y, int xOffset, int yOffset, - DragView dragView, Object dragInfo) { + public void onDrop(DragObject d) { ShortcutInfo item; - if (dragInfo instanceof ApplicationInfo) { + if (d.dragInfo instanceof ApplicationInfo) { // Came from all apps -- make a copy - item = ((ApplicationInfo)dragInfo).makeShortcut(); + item = ((ApplicationInfo) d.dragInfo).makeShortcut(); } else { - item = (ShortcutInfo)dragInfo; + item = (ShortcutInfo) d.dragInfo; } item.cellX = -1; item.cellY = -1; @@ -149,8 +145,6 @@ public class FolderIcon extends FrameLayout implements DropTarget, FolderListene void saveState(CellLayout.LayoutParams lp) { mOriginalWidth = lp.width; mOriginalHeight = lp.height; - mOriginalX = lp.x; - mOriginalY = lp.y; } private void animateToAcceptState() { @@ -213,27 +207,22 @@ public class FolderIcon extends FrameLayout implements DropTarget, FolderListene mFolderLocY = tvLocation[1] - wsLocation[1] + getMeasuredHeight() / 2; } - public void onDragEnter(DragSource source, int x, int y, int xOffset, int yOffset, - DragView dragView, Object dragInfo) { - if (!willAcceptItem((ItemInfo) dragInfo)) return; + public void onDragEnter(DragObject d) { + if (!willAcceptItem((ItemInfo) d.dragInfo)) return; determineFolderLocationInWorkspace(); mLauncher.getWorkspace().showFolderAccept(this); animateToAcceptState(); } - public void onDragOver(DragSource source, int x, int y, int xOffset, int yOffset, - DragView dragView, Object dragInfo) { + public void onDragOver(DragObject d) { } - public void onDragExit(DragSource source, int x, int y, int xOffset, int yOffset, - DragView dragView, Object dragInfo) { - if (!willAcceptItem((ItemInfo) dragInfo)) return; + public void onDragExit(DragObject d) { + if (!willAcceptItem((ItemInfo) d.dragInfo)) return; animateToNaturalState(); } - @Override - public DropTarget getDropTargetDelegate(DragSource source, int x, int y, int xOffset, int yOffset, - DragView dragView, Object dragInfo) { + public DropTarget getDropTargetDelegate(DragObject d) { return null; } |