diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-03-02 13:39:13 -0800 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2012-03-02 13:45:03 -0800 |
| commit | 47f747418efa337e0fc56e10748a6a595b8974f6 (patch) | |
| tree | 23fad5b83e8a00b59e6f6b6397a56ae803b9654d /src | |
| parent | ca83eeb0919b690350d86a9562f58a5a56d196bf (diff) | |
| download | android_packages_apps_Trebuchet-47f747418efa337e0fc56e10748a6a595b8974f6.tar.gz android_packages_apps_Trebuchet-47f747418efa337e0fc56e10748a6a595b8974f6.tar.bz2 android_packages_apps_Trebuchet-47f747418efa337e0fc56e10748a6a595b8974f6.zip | |
Improve code to determine which pages are visible
Change-Id: I2c349d987ddb5f399283088c128e6d4d056da4da
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; |