commit df3080e8654b0c68da3925e1ecdb8ecf114b7d91
author Romain Guy <romainguy@google.com> Wed Feb 17 15:24:26 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 17 15:24:26 2010 -0800
tree ee3379643f4b1bc87a5a82e95d4830f3c4a4b6fb
parent 339cdd9816ed7737d3b6669dca66608d867dd82a
parent ed2390e7091511618bf5030d4996ccafadba3cc3

Merge "Correctly recenter the wallpaper when going back to default screen."

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 909d7a9..de4f051 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -256,6 +256,7 @@
         mPreviousIndicator.setLevel(mCurrentScreen);
         mNextIndicator.setLevel(mCurrentScreen);
         scrollTo(mCurrentScreen * getWidth(), 0);
+        updateWallpaperOffset();
         invalidate();
     }
 
@@ -833,7 +834,7 @@
 
         mPreviousIndicator.setLevel(mNextScreen);
         mNextIndicator.setLevel(mNextScreen);
-        
+
         View focusedChild = getFocusedChild();
         if (focusedChild != null && screenDelta != 0 && focusedChild == getChildAt(mCurrentScreen)) {
             focusedChild.clearFocus();