Merge "Fix weird page snap bug when long pressing on music controls (issue 11420449)" into klp-dev

This commit is contained in:
Adam Cohen
2013-11-01 18:48:42 +00:00
committed by Android (Google) Code Review

View File

@@ -2278,11 +2278,11 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
mTempVisiblePagesRange[0] = 0; mTempVisiblePagesRange[0] = 0;
mTempVisiblePagesRange[1] = getPageCount() - 1; mTempVisiblePagesRange[1] = getPageCount() - 1;
boundByReorderablePages(true, mTempVisiblePagesRange); boundByReorderablePages(true, mTempVisiblePagesRange);
mReorderingStarted = true;
// Check if we are within the reordering range // Check if we are within the reordering range
if (mTempVisiblePagesRange[0] <= dragViewIndex && if (mTempVisiblePagesRange[0] <= dragViewIndex &&
dragViewIndex <= mTempVisiblePagesRange[1]) { dragViewIndex <= mTempVisiblePagesRange[1]) {
mReorderingStarted = true;
if (zoomOut()) { if (zoomOut()) {
// Find the drag view under the pointer // Find the drag view under the pointer
mDragView = getChildAt(dragViewIndex); mDragView = getChildAt(dragViewIndex);