am 35ef6aae: am 0655904a: Fixing regression in reordering (issue 10994971)

* commit '35ef6aae304e4b62f492a2ac7f05c986c7fe6a6b': Fixing regression in reordering (issue 10994971)
2013-09-29 18:37:39 -07:00
parent a8901439e7 35ef6aae30
commit 579a34186f
1 changed files with 5 additions and 6 deletions
@@ -925,12 +925,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
            mFirstLayout = false;
        }

-        if (isPageMoving()) {
-            // If the page is moving, then snap it to the final position to ensure we don't get
-            // stuck between pages
-            snapToDestination();
-        }
-
        if (childCount > 0) {
            final int index = isLayoutRtl() ? 0 : childCount - 1;
            mMaxScrollX = getScrollForPage(index);
@@ -2324,6 +2318,11 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
            loadAssociatedPages(mCurrentPage, immediateAndOnly);
            requestLayout();
        }
+        if (isPageMoving()) {
+            // If the page is moving, then snap it to the final position to ensure we don't get
+            // stuck between pages
+            snapToDestination();
+        }
    }

    // Animate the drag view back to the original position