diff options
author | Adam Cohen <adamcohen@google.com> | 2013-12-13 00:24:05 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-12-13 00:24:06 +0000 |
commit | 69a10949d62255f6b32dff8c3a6a91cbfcf98587 (patch) | |
tree | 07b0621f6cd018784e521700422bd905f62c0a9c /src/com/android/launcher3/PagedView.java | |
parent | 306c1cf200d4e334b19e09a5a5a2026d9f6d12b2 (diff) | |
parent | 4de0974c460ce6439cce7931fb0ba945095a4b94 (diff) | |
download | android_packages_apps_Trebuchet-69a10949d62255f6b32dff8c3a6a91cbfcf98587.tar.gz android_packages_apps_Trebuchet-69a10949d62255f6b32dff8c3a6a91cbfcf98587.tar.bz2 android_packages_apps_Trebuchet-69a10949d62255f6b32dff8c3a6a91cbfcf98587.zip |
Merge "Fix NPE from feedback (issue 12106858)" into jb-ub-now-kermit
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index c216f926f..1e4f4fa7f 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1152,22 +1152,22 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc @Override protected void dispatchDraw(Canvas canvas) { - int halfScreenSize = getViewportWidth() / 2; - // mOverScrollX is equal to getScrollX() when we're within the normal scroll range. - // Otherwise it is equal to the scaled overscroll position. - int screenCenter = mOverScrollX + halfScreenSize; - - if (screenCenter != mLastScreenCenter || mForceScreenScrolled) { - // set mForceScreenScrolled before calling screenScrolled so that screenScrolled can - // set it for the next frame - mForceScreenScrolled = false; - screenScrolled(screenCenter); - mLastScreenCenter = screenCenter; - } - // Find out which screens are visible; as an optimization we only call draw on them final int pageCount = getChildCount(); if (pageCount > 0) { + int halfScreenSize = getViewportWidth() / 2; + // mOverScrollX is equal to getScrollX() when we're within the normal scroll range. + // Otherwise it is equal to the scaled overscroll position. + int screenCenter = mOverScrollX + halfScreenSize; + + if (screenCenter != mLastScreenCenter || mForceScreenScrolled) { + // set mForceScreenScrolled before calling screenScrolled so that screenScrolled can + // set it for the next frame + mForceScreenScrolled = false; + screenScrolled(screenCenter); + mLastScreenCenter = screenCenter; + } + getVisiblePages(mTempVisiblePagesRange); final int leftScreen = mTempVisiblePagesRange[0]; final int rightScreen = mTempVisiblePagesRange[1]; |