From 5037a0b02a720ae14cbf673d7d5bb148f5a524c8 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Thu, 1 Sep 2011 13:10:40 -0700
Subject: Fix small issue with wallpaper jump

Change-Id: I1f9ad36b7c96528f70b82804f2505bc97c453a32
---
 src/com/android/launcher2/Workspace.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index d191d0739..29da4bf2f 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -819,23 +819,23 @@ public class Workspace extends SmoothPagedView
     @Override
     protected void updateCurrentPageScroll() {
         super.updateCurrentPageScroll();
-        computeWallpaperScrollRatio();
+        computeWallpaperScrollRatio(mCurrentPage);
     }
 
     @Override
     protected void snapToPage(int whichPage) {
         super.snapToPage(whichPage);
-        computeWallpaperScrollRatio();
+        computeWallpaperScrollRatio(whichPage);
     }
 
-    private void computeWallpaperScrollRatio() {
+    private void computeWallpaperScrollRatio(int page) {
         // Here, we determine what the desired scroll would be with and without a layout scale,
         // and compute a ratio between the two. This allows us to adjust the wallpaper offset
         // as though there is no layout scale.
         float layoutScale = mLayoutScale;
-        int scaled = getChildOffset(mCurrentPage) - getRelativeChildOffset(mCurrentPage);
+        int scaled = getChildOffset(page) - getRelativeChildOffset(page);
         mLayoutScale = 1.0f;
-        float unscaled = getChildOffset(mCurrentPage) - getRelativeChildOffset(mCurrentPage);
+        float unscaled = getChildOffset(page) - getRelativeChildOffset(page);
         mLayoutScale = layoutScale;
         if (scaled > 0) {
             mWallpaperScrollRatio = (1.0f * unscaled) / scaled;
-- 
cgit v1.2.3