diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-08-11 16:02:02 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-08-15 10:08:16 -0700 |
commit | 06e21a25877db7207b5393ab163028bb4116df4f (patch) | |
tree | 561c8fa4afcbeb024082f2c6947a538cd54eff9e /src/com/android/launcher3/CellLayout.java | |
parent | 8769b44ae073ea7ec5ba5b7687105df6d35c3282 (diff) | |
download | android_packages_apps_Trebuchet-06e21a25877db7207b5393ab163028bb4116df4f.tar.gz android_packages_apps_Trebuchet-06e21a25877db7207b5393ab163028bb4116df4f.tar.bz2 android_packages_apps_Trebuchet-06e21a25877db7207b5393ab163028bb4116df4f.zip |
Moving the state changes during drag-n-drop from startDrag to onDragStart
This will allow drag controller to optinally defer drag, based on some
threshold, by simply deferring the callback onDragStart
Change-Id: I17c06a15e2092b9797c7e57529b12a53d2acae6e
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
-rw-r--r-- | src/com/android/launcher3/CellLayout.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 77f6612c1..ee2131398 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -54,6 +54,7 @@ import com.android.launcher3.accessibility.WorkspaceAccessibilityHelper; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.config.ProviderConfig; import com.android.launcher3.folder.FolderIcon; +import com.android.launcher3.graphics.DragPreviewProvider; import com.android.launcher3.util.CellAndSpan; import com.android.launcher3.util.GridOccupancy; import com.android.launcher3.util.ParcelableSparseArray; @@ -1047,15 +1048,16 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { return false; } - void visualizeDropLocation(View v, Bitmap dragOutline, int cellX, int cellY, int spanX, - int spanY, boolean resize, DropTarget.DragObject dragObject) { + void visualizeDropLocation(View v, DragPreviewProvider outlineProvider, int cellX, int cellY, + int spanX, int spanY, boolean resize, DropTarget.DragObject dragObject) { final int oldDragCellX = mDragCell[0]; final int oldDragCellY = mDragCell[1]; - if (dragOutline == null && v == null) { + if (outlineProvider == null || outlineProvider.gerenatedDragOutline == null) { return; } + Bitmap dragOutline = outlineProvider.gerenatedDragOutline; if (cellX != oldDragCellX || cellY != oldDragCellY) { Point dragOffset = dragObject.dragView.getDragVisualizeOffset(); Rect dragRegion = dragObject.dragView.getDragRegion(); |