diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-03-02 14:06:14 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-02 14:06:14 -0800 |
| commit | b7aa41dc384a6cb8c3440896099d42931de83b06 (patch) | |
| tree | eb7151e5a491d66136d2a5fce63e4d580332be42 /src | |
| parent | 169c1f5fe242a3042f04e4a762f0bd595731c2e5 (diff) | |
| parent | 47f747418efa337e0fc56e10748a6a595b8974f6 (diff) | |
| download | android_packages_apps_Trebuchet-b7aa41dc384a6cb8c3440896099d42931de83b06.tar.gz android_packages_apps_Trebuchet-b7aa41dc384a6cb8c3440896099d42931de83b06.tar.bz2 android_packages_apps_Trebuchet-b7aa41dc384a6cb8c3440896099d42931de83b06.zip | |
Merge "Improve code to determine which pages are visible"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/PagedView.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index a615b59f2..e64b0c3a6 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -717,14 +717,18 @@ public abstract class PagedView extends ViewGroup { final int screenWidth = getMeasuredWidth(); int leftScreen = 0; int rightScreen = 0; + View currPage = getPageAt(leftScreen); while (leftScreen < pageCount - 1 && - getPageAt(leftScreen).getRight() <= mScrollX) { + currPage.getRight() - currPage.getPaddingRight() < mScrollX) { leftScreen++; + currPage = getPageAt(leftScreen); } rightScreen = leftScreen; + currPage = getPageAt(rightScreen + 1); while (rightScreen < pageCount - 1 && - getPageAt(rightScreen + 1).getLeft() < mScrollX + screenWidth) { + currPage.getLeft() + currPage.getPaddingLeft() < mScrollX + screenWidth) { rightScreen++; + currPage = getPageAt(rightScreen + 1); } range[0] = leftScreen; range[1] = rightScreen; |