Fix overhang of custom content area into first screen of launcher

Change-Id: I2e8cbedb644c8399be269616e617851136489da5
2013-07-24 13:55:41 -07:00
parent 390af56a31
commit 6ad0e7dcae
2 changed files with 15 additions and 12 deletions
@@ -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;
+                }
            }
        }