diff options
author | Winson Chung <winsonc@google.com> | 2011-09-14 17:56:27 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2011-09-14 17:59:24 -0700 |
commit | eb00d4afdd0e204bcb8379529bc9ef222dd28abe (patch) | |
tree | e3c12267dacc91ec4ce0858a06a1f95b82817ce9 /src/com/android/launcher2 | |
parent | 286f2e1da9f8638b914e0ca1659f36369ee6b501 (diff) | |
download | android_packages_apps_Trebuchet-eb00d4afdd0e204bcb8379529bc9ef222dd28abe.tar.gz android_packages_apps_Trebuchet-eb00d4afdd0e204bcb8379529bc9ef222dd28abe.tar.bz2 android_packages_apps_Trebuchet-eb00d4afdd0e204bcb8379529bc9ef222dd28abe.zip |
Fixing regression where scroll position would be offset when rotated.
- Fixes the scrolling issue only in conjunction with framework measure fix
- Updating the wallpaper gallery item background
Change-Id: Id7ff602837dbe1d8a2aaec6ec49b667f11d01bc9
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/PagedView.java | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index dca4d1448..9a105d104 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -539,15 +539,6 @@ public abstract class PagedView extends ViewGroup { } if (DEBUG) Log.d(TAG, "PagedView.onLayout()"); - if (mFirstLayout && mCurrentPage >= 0 && mCurrentPage < getChildCount()) { - setHorizontalScrollBarEnabled(false); - int newX = getChildOffset(mCurrentPage) - getRelativeChildOffset(mCurrentPage); - scrollTo(newX, 0); - mScroller.setFinalX(newX); - setHorizontalScrollBarEnabled(true); - mFirstLayout = false; - } - final int verticalPadding = mPaddingTop + mPaddingBottom; final int childCount = getChildCount(); int childLeft = 0; @@ -578,6 +569,16 @@ public abstract class PagedView extends ViewGroup { childLeft += childWidth + mPageSpacing; } } + + if (mFirstLayout && mCurrentPage >= 0 && mCurrentPage < getChildCount()) { + setHorizontalScrollBarEnabled(false); + int newX = getChildOffset(mCurrentPage) - getRelativeChildOffset(mCurrentPage); + scrollTo(newX, 0); + mScroller.setFinalX(newX); + setHorizontalScrollBarEnabled(true); + mFirstLayout = false; + } + if (mFirstLayout && mCurrentPage >= 0 && mCurrentPage < getChildCount()) { mFirstLayout = false; } |