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

* commit '0655904abd2e67f3c4c5b9e8e57cee6f8f562076':
  Fixing regression in reordering (issue 10994971)
This commit is contained in:
Adam Cohen
2013-09-29 18:35:10 -07:00
committed by Android Git Automerger
+5 -6
View File
@@ -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