commit 6ad0e7dcaeef394cc1c28294dde309da69233412
author Adam Cohen <adamcohen@google.com> Wed Jul 24 13:55:41 2013 -0700
committer Adam Cohen <adamcohen@google.com> Wed Jul 24 14:25:58 2013 -0700
tree 598332d287e30afcde0d4c31392fcd34886cbf41
parent 390af56a31562cc7c42a719db4192d0cee0b0f9d

Fix overhang of custom content area into first screen of launcher

Change-Id: I2e8cbedb644c8399be269616e617851136489da5

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index ed88ea9..9a851ac 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -833,6 +833,7 @@
         }
 
         for (int i = startIndex; i != endIndex; i += delta) {
+
             final View child = getPageAt(i);
             LayoutParams lp = (LayoutParams) child.getLayoutParams();
             int childTop;
@@ -856,10 +857,13 @@
 
                 // 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;
+                }
             }
         }