From 0655904abd2e67f3c4c5b9e8e57cee6f8f562076 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Sun, 29 Sep 2013 18:30:56 -0700
Subject: Fixing regression in reordering (issue 10994971)

Change-Id: I2be98fc892c1a4392c4a5e035dd4cc1fa6fab0a9
---
 src/com/android/launcher3/PagedView.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 9cfb3d911..41687d383 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -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
-- 
cgit v1.2.3