diff options
Diffstat (limited to 'src/com/android/launcher2/PagedView.java')
| -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 8a2a5a0ac..604e73c1d 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -396,7 +396,9 @@ public abstract class PagedView extends ViewGroup { protected boolean computeScrollHelper() { if (mScroller.computeScrollOffset()) { // Don't bother scrolling if the page does not need to be moved - if (mScrollX != mScroller.getCurrX() || mScrollY != mScroller.getCurrY()) { + if (mScrollX != mScroller.getCurrX() + || mScrollY != mScroller.getCurrY() + || mOverScrollX != mScroller.getCurrX()) { scrollTo(mScroller.getCurrX(), mScroller.getCurrY()); } invalidate(); @@ -755,9 +757,11 @@ public abstract class PagedView extends ViewGroup { 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; - mForceScreenScrolled = false; } // Find out which screens are visible; as an optimization we only call draw on them |