am b8f7475c: am e269ca42: Merge "Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)" into jb-ub-now-indigo-rose

* commit 'b8f7475c32627a53bf23b914cd904b4f2e9dff57': Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)
2013-10-02 06:58:15 -07:00
parent d40b2e993f b8f7475c32
commit ee5b470b34
1 changed files with 3 additions and 0 deletions
@@ -518,6 +518,9 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
    void setCurrentPage(int currentPage) {
        if (!mScroller.isFinished()) {
            mScroller.abortAnimation();
+            // We need to clean up the next page here to avoid computeScrollHelper from
+            // updating current page on the pass.
+            mNextPage = INVALID_PAGE;
        }
        // don't introduce any checks like mCurrentPage == currentPage here-- if we change the
        // the default