diff options
author | Adam Cohen <adamcohen@google.com> | 2013-07-01 17:03:59 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2013-07-08 18:32:57 -0700 |
commit | 7d30a37007bac318db1c9af47a9af12d348042a5 (patch) | |
tree | 83524dc8cd4dd05c0e8ce3a9f5607e3e7c08efee /src/com/android/launcher3/DropTarget.java | |
parent | 70c987a0fea53583b22650bed6251e2dcc68bdac (diff) | |
download | android_packages_apps_Trebuchet-7d30a37007bac318db1c9af47a9af12d348042a5.tar.gz android_packages_apps_Trebuchet-7d30a37007bac318db1c9af47a9af12d348042a5.tar.bz2 android_packages_apps_Trebuchet-7d30a37007bac318db1c9af47a9af12d348042a5.zip |
Porting PagedView from KG to gain simplified scaling model, reordering
-> We are no longer scaling individual Celllayouts, instead we are scaling
the entire Workspace (and the CellLayouts come along for the ride)
-> Due to the above change, many assumptions were broken. In particular,
our drag and drop / animation archiecture is fairly fragile due to the
frequent and complex mapping of points between different bits of the
hierarchy. This CL contains a number of fixes which address such
breakages.
Change-Id: I2e630eab17528729b764b61f587858f6499fd318
Diffstat (limited to 'src/com/android/launcher3/DropTarget.java')
-rw-r--r-- | src/com/android/launcher3/DropTarget.java | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/com/android/launcher3/DropTarget.java b/src/com/android/launcher3/DropTarget.java index fa364fadf..64f0ac867 100644 --- a/src/com/android/launcher3/DropTarget.java +++ b/src/com/android/launcher3/DropTarget.java @@ -141,25 +141,6 @@ public interface DropTarget { void onFlingToDelete(DragObject dragObject, int x, int y, PointF vec); /** - * Allows a DropTarget to delegate drag and drop events to another object. - * - * Most subclasses will should just return null from this method. - * - * @param source DragSource where the drag started - * @param x X coordinate of the drop location - * @param y Y coordinate of the drop location - * @param xOffset Horizontal offset with the object being dragged where the original - * touch happened - * @param yOffset Vertical offset with the object being dragged where the original - * touch happened - * @param dragView The DragView that's being dragged around on screen. - * @param dragInfo Data associated with the object being dragged - * - * @return The DropTarget to delegate to, or null to not delegate to another object. - */ - DropTarget getDropTargetDelegate(DragObject dragObject); - - /** * Check if a drop action can occur at, or near, the requested location. * This will be called just before onDrop. * @@ -177,7 +158,7 @@ public interface DropTarget { boolean acceptDrop(DragObject dragObject); // These methods are implemented in Views - void getHitRect(Rect outRect); + void getHitRectRelativeToDragLayer(Rect outRect); void getLocationInDragLayer(int[] loc); int getLeft(); int getTop(); |