diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-15 14:45:54 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-02-15 14:45:54 -0800 |
| commit | ed1816e3a828046439da5cb31a65af4641be9076 (patch) | |
| tree | 994e4ed51b3e1630e338b3ec255a8f4dce429953 /src/com/cyanogenmod/trebuchet/AppWidgetResizeFrame.java | |
| parent | c43d6eebe95dcabcb4ded1c4da8c6cc21d2514f5 (diff) | |
| parent | 002c25eede2a33a5378c16c5bb9165179783e729 (diff) | |
| download | android_packages_apps_Trebuchet-ed1816e3a828046439da5cb31a65af4641be9076.tar.gz android_packages_apps_Trebuchet-ed1816e3a828046439da5cb31a65af4641be9076.tar.bz2 android_packages_apps_Trebuchet-ed1816e3a828046439da5cb31a65af4641be9076.zip | |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Launcher2 into treb
Android 4.2.2 release 1
Conflicts:
res/layout-land/launcher.xml
res/layout-port/launcher.xml
res/layout-sw720dp/launcher.xml
src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java
src/com/cyanogenmod/trebuchet/CellLayout.java
src/com/cyanogenmod/trebuchet/Launcher.java
src/com/cyanogenmod/trebuchet/PagedView.java
Change-Id: I415138430337bcd21070b815a80de9c0cdd52239
Diffstat (limited to 'src/com/cyanogenmod/trebuchet/AppWidgetResizeFrame.java')
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/AppWidgetResizeFrame.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/cyanogenmod/trebuchet/AppWidgetResizeFrame.java b/src/com/cyanogenmod/trebuchet/AppWidgetResizeFrame.java index 5b868c179..48d41160d 100644 --- a/src/com/cyanogenmod/trebuchet/AppWidgetResizeFrame.java +++ b/src/com/cyanogenmod/trebuchet/AppWidgetResizeFrame.java @@ -389,8 +389,10 @@ public class AppWidgetResizeFrame extends FrameLayout { public void snapToWidget(boolean animate) { final DragLayer.LayoutParams lp = (DragLayer.LayoutParams) getLayoutParams(); - int xOffset = mCellLayout.getLeft() + mCellLayout.getPaddingLeft() - mWorkspace.getScrollX(); - int yOffset = mCellLayout.getTop() + mCellLayout.getPaddingTop() - mWorkspace.getScrollY(); + int xOffset = mCellLayout.getLeft() + mCellLayout.getPaddingLeft() + + mDragLayer.getPaddingLeft() - mWorkspace.getScrollX(); + int yOffset = mCellLayout.getTop() + mCellLayout.getPaddingTop() + + mDragLayer.getPaddingTop() - mWorkspace.getScrollY(); int newWidth = mWidgetView.getWidth() + 2 * mBackgroundPadding - mWidgetPaddingLeft - mWidgetPaddingRight; |