diff options
author | Adam Cohen <adamcohen@google.com> | 2011-11-15 10:49:51 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-15 10:49:51 -0800 |
commit | 4ff78b0b1231f9cffdaa17d8747bac7f4561372e (patch) | |
tree | 2a8d58434e0bc1dd5c66994a5cf4878a8dd896df /src/com | |
parent | 182c4d269eee86a30230dfdd53a5a3d6160dfdde (diff) | |
parent | 60b0712bf555a32e609271e0b8ea90743a148efb (diff) | |
download | android_packages_apps_Trebuchet-4ff78b0b1231f9cffdaa17d8747bac7f4561372e.tar.gz android_packages_apps_Trebuchet-4ff78b0b1231f9cffdaa17d8747bac7f4561372e.tar.bz2 android_packages_apps_Trebuchet-4ff78b0b1231f9cffdaa17d8747bac7f4561372e.zip |
Merge "Fixing place where offset caches weren't being invalidated (issue 5608330)" into ics-mr1
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher2/PagedView.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index 49c25b551..935d26df9 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -204,7 +204,7 @@ public abstract class PagedView extends ViewGroup { TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.PagedView, defStyle, 0); - mPageSpacing = a.getDimensionPixelSize(R.styleable.PagedView_pageSpacing, 0); + setPageSpacing(a.getDimensionPixelSize(R.styleable.PagedView_pageSpacing, 0)); mPageLayoutPaddingTop = a.getDimensionPixelSize( R.styleable.PagedView_pageLayoutPaddingTop, 0); mPageLayoutPaddingBottom = a.getDimensionPixelSize( @@ -557,6 +557,11 @@ public abstract class PagedView extends ViewGroup { scrollToNewPageWithoutMovingPages(mCurrentPage); } + public void setPageSpacing(int pageSpacing) { + mPageSpacing = pageSpacing; + invalidateCachedOffsets(); + } + @Override protected void onLayout(boolean changed, int left, int top, int right, int bottom) { if (!mIsDataReady) { @@ -574,7 +579,7 @@ public abstract class PagedView extends ViewGroup { // Calculate the variable page spacing if necessary if (mPageSpacing < 0) { - mPageSpacing = ((right - left) - getChildAt(0).getMeasuredWidth()) / 2; + setPageSpacing(((right - left) - getChildAt(0).getMeasuredWidth()) / 2); } } |