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/ButtonDropTarget.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/ButtonDropTarget.java')
-rw-r--r-- | src/com/android/launcher3/ButtonDropTarget.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java index a7486a8e3..3fcc2b904 100644 --- a/src/com/android/launcher3/ButtonDropTarget.java +++ b/src/com/android/launcher3/ButtonDropTarget.java @@ -112,7 +112,7 @@ public class ButtonDropTarget extends TextView implements DropTarget, DragContro } @Override - public void getHitRect(android.graphics.Rect outRect) { + public void getHitRectRelativeToDragLayer(android.graphics.Rect outRect) { super.getHitRect(outRect); outRect.bottom += mBottomDragPadding; } @@ -155,11 +155,6 @@ public class ButtonDropTarget extends TextView implements DropTarget, DragContro return to; } - @Override - public DropTarget getDropTargetDelegate(DragObject d) { - return null; - } - public void getLocationInDragLayer(int[] loc) { mLauncher.getDragLayer().getLocationInDragLayer(this, loc); } |