diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-07-24 13:55:41 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2013-07-24 14:25:58 -0700 |
| commit | 6ad0e7dcaeef394cc1c28294dde309da69233412 (patch) | |
| tree | 598332d287e30afcde0d4c31392fcd34886cbf41 /src/com/android/launcher3/PagedView.java | |
| parent | 390af56a31562cc7c42a719db4192d0cee0b0f9d (diff) | |
| download | android_packages_apps_Trebuchet-6ad0e7dcaeef394cc1c28294dde309da69233412.tar.gz android_packages_apps_Trebuchet-6ad0e7dcaeef394cc1c28294dde309da69233412.tar.bz2 android_packages_apps_Trebuchet-6ad0e7dcaeef394cc1c28294dde309da69233412.zip | |
Fix overhang of custom content area into first screen of launcher
Change-Id: I2e8cbedb644c8399be269616e617851136489da5
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index ed88ea90d..9a851ac36 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -833,6 +833,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc } for (int i = startIndex; i != endIndex; i += delta) { + final View child = getPageAt(i); LayoutParams lp = (LayoutParams) child.getLayoutParams(); int childTop; @@ -856,10 +857,13 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc // We assume the left and right padding are equal, and hence center the pages // horizontally - int scrollOffset = false ? 0 : (getViewportWidth() - childWidth) / 2; + int scrollOffset = (getViewportWidth() - childWidth) / 2; mPageScrolls[i] = childLeft - scrollOffset - offsetX; - childLeft += childWidth + mPageSpacing; + if (i != endIndex - delta) { + int nextScrollOffset = (getViewportWidth() - getChildWidth(i + delta)) / 2; + childLeft += childWidth + nextScrollOffset; + } } } |