diff options
| author | Romain Guy <romainguy@google.com> | 2010-02-17 15:24:26 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-17 15:24:26 -0800 |
| commit | df3080e8654b0c68da3925e1ecdb8ecf114b7d91 (patch) | |
| tree | ee3379643f4b1bc87a5a82e95d4830f3c4a4b6fb /src | |
| parent | 339cdd9816ed7737d3b6669dca66608d867dd82a (diff) | |
| parent | ed2390e7091511618bf5030d4996ccafadba3cc3 (diff) | |
| download | android_packages_apps_Trebuchet-df3080e8654b0c68da3925e1ecdb8ecf114b7d91.tar.gz android_packages_apps_Trebuchet-df3080e8654b0c68da3925e1ecdb8ecf114b7d91.tar.bz2 android_packages_apps_Trebuchet-df3080e8654b0c68da3925e1ecdb8ecf114b7d91.zip | |
Merge "Correctly recenter the wallpaper when going back to default screen."
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 909d7a9b1..de4f0518a 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -256,6 +256,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag mPreviousIndicator.setLevel(mCurrentScreen); mNextIndicator.setLevel(mCurrentScreen); scrollTo(mCurrentScreen * getWidth(), 0); + updateWallpaperOffset(); invalidate(); } @@ -833,7 +834,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag mPreviousIndicator.setLevel(mNextScreen); mNextIndicator.setLevel(mNextScreen); - + View focusedChild = getFocusedChild(); if (focusedChild != null && screenDelta != 0 && focusedChild == getChildAt(mCurrentScreen)) { focusedChild.clearFocus(); |