commit 37990b4b4fc241fcf12a4b6d1725c69605b26605
author Michael Jurka <mikejurka@google.com> Tue Sep 25 15:14:30 2012 -0700
committer Michael Jurka <mikejurka@google.com> Tue Sep 25 15:14:30 2012 -0700
tree 01460c117a608feb4d80512a7a0d2e3d1d4b8090
parent e19bbca93eb93d4daaf31ac3e7bd8e4c32838af4

Fix # 6925851: Workspace page spacing gets messed up

Change-Id: I694fa1e04049e35a415b1f1a85759e501fec6258

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 7d17249..77cb467 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -98,6 +98,7 @@
     private float mOverScrollMaxBackgroundAlpha = 0.0f;
 
     private float mWallpaperScrollRatio = 1.0f;
+    private int mOriginalPageSpacing;
 
     private final WallpaperManager mWallpaperManager;
     private IBinder mWindowToken;
@@ -273,6 +274,7 @@
     public Workspace(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
         mContentIsRefreshable = false;
+        mOriginalPageSpacing = mPageSpacing;
 
         mDragEnforcer = new DropTarget.DragEnforcer(context);
         // With workspace, data is available straight from the get-go
@@ -1594,7 +1596,7 @@
                 setLayoutScale(finalScaleFactor);
             }
         } else {
-            setPageSpacing(PagedView.AUTOMATIC_PAGE_SPACING);
+            setPageSpacing(mOriginalPageSpacing);
             setLayoutScale(1.0f);
         }