Fix bug with home screen position when switching

from portrait to landscape and v.v.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index e3c36af3b..ebb28f928 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -329,18 +329,19 @@ public abstract class PagedView extends ViewGroup {
         }
 
         setMeasuredDimension(widthSize, heightSize);
+    }
 
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         if (mFirstLayout && mCurrentPage >= 0 && mCurrentPage < getChildCount()) {
             setHorizontalScrollBarEnabled(false);
-            scrollTo(getChildOffset(mCurrentPage) - getRelativeChildOffset(mCurrentPage), 0);
-            mScroller.setFinalX(getChildOffset(mCurrentPage) - getRelativeChildOffset(mCurrentPage));
+            int newX = getChildOffset(mCurrentPage) - getRelativeChildOffset(mCurrentPage);
+            scrollTo(newX, 0);
+            mScroller.setFinalX(newX);
             setHorizontalScrollBarEnabled(true);
             mFirstLayout = false;
         }
-    }
 
-    @Override
-    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         final int childCount = getChildCount();
         int childLeft = 0;
         if (childCount > 0) {