diff options
| author | Patrick Dubroy <dubroy@google.com> | 2011-01-17 16:57:49 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-17 16:57:49 -0800 |
| commit | 1d8ad0dd3b295b35e7fc9944eb298150b4fa4a99 (patch) | |
| tree | 78aca106d272e58fd2c4ea8cc744d2144534202c /src/com/android/launcher2/Workspace.java | |
| parent | 8bc22687b4418b8a3982dc18553e0375287e6217 (diff) | |
| parent | 62bbb3c573fe902940431e4b957c0c4918358d36 (diff) | |
| download | packages_apps_trebuchet-1d8ad0dd3b295b35e7fc9944eb298150b4fa4a99.zip packages_apps_trebuchet-1d8ad0dd3b295b35e7fc9944eb298150b4fa4a99.tar.gz packages_apps_trebuchet-1d8ad0dd3b295b35e7fc9944eb298150b4fa4a99.tar.bz2 | |
Merge "Fix 3099036: Drag visualization appears in wrong spot" into honeycomb
Diffstat (limited to 'src/com/android/launcher2/Workspace.java')
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 7ed19b9..a25db39 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -2259,6 +2259,13 @@ public class Workspace extends SmoothPagedView dragView.getDragRegionHeight()); } } + } else if (source == this) { + // When dragging from the workspace, the drag view is slightly bigger than + // the original view, and offset vertically. Adjust to account for this. + final View origView = mDragInfo.cell; + originX += (dragView.getMeasuredWidth() - origView.getWidth()) / 2; + originY += (dragView.getMeasuredHeight() - origView.getHeight()) / 2 + + dragView.getOffsetY(); } if (mDragTargetLayout != null) { |