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/AppsCustomizePagedView.java | |
| parent | c43d6eebe95dcabcb4ded1c4da8c6cc21d2514f5 (diff) | |
| parent | 002c25eede2a33a5378c16c5bb9165179783e729 (diff) | |
| download | packages_apps_trebuchet-ed1816e3a828046439da5cb31a65af4641be9076.zip packages_apps_trebuchet-ed1816e3a828046439da5cb31a65af4641be9076.tar.gz packages_apps_trebuchet-ed1816e3a828046439da5cb31a65af4641be9076.tar.bz2 | |
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/AppsCustomizePagedView.java')
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java index 8d4e4d7..9f7595d 100644 --- a/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java +++ b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java @@ -600,9 +600,10 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen int[] pos = mWidgetSpacingLayout.estimateCellPosition(mClingFocusedX, mClingFocusedY); mLauncher.getDragLayer().getLocationInDragLayer(this, offset); // PagedViews are centered horizontally but top aligned + // Note we have to shift the items up now that Launcher sits under the status bar pos[0] += (getMeasuredWidth() - mWidgetSpacingLayout.getMeasuredWidth()) / 2 + offset[0]; - pos[1] += offset[1]; + pos[1] += offset[1] - mLauncher.getDragLayer().getPaddingTop(); mLauncher.showFirstRunAllAppsCling(pos); } else if (!mHasShownAllAppsSortCling && isDataReady() && allAppsCling != null && allAppsCling.isDismissed()) { |