From 798300c4c05b12228f2e4f31c49c3cb728a37889 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Tue, 11 Aug 2009 14:43:29 -0700 Subject: [PATCH] Centers the wallpaper by default --- src/com/android/launcher2/Workspace.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index bfda3035f9..c9604121f7 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -272,6 +272,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag clearVacantCache(); mCurrentScreen = Math.max(0, Math.min(currentScreen, getChildCount() - 1)); scrollTo(mCurrentScreen * getWidth(), 0); + updateWallpaperOffset(); invalidate(); } @@ -456,9 +457,11 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag } private void updateWallpaperOffset() { - int scrollRange = getChildAt(getChildCount()-1).getRight()-getWidth(); - mWallpaperManager.setWallpaperOffsets(getWindowToken(), - mScrollX/(float)scrollRange, 0); + updateWallpaperOffset(getChildAt(getChildCount() - 1).getRight() - (mRight - mLeft)); + } + + private void updateWallpaperOffset(int scrollRange) { + mWallpaperManager.setWallpaperOffsets(getWindowToken(), mScrollX / (float) scrollRange, 0); } @Override @@ -548,6 +551,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag if (mFirstLayout) { scrollTo(mCurrentScreen * width, 0); + updateWallpaperOffset(width * (getChildCount() - 1)); mFirstLayout = false; } }