diff options
author | Michael Jurka <mikejurka@google.com> | 2012-09-25 15:14:30 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2012-09-25 15:14:30 -0700 |
commit | 37990b4b4fc241fcf12a4b6d1725c69605b26605 (patch) | |
tree | 01460c117a608feb4d80512a7a0d2e3d1d4b8090 /src/com/android/launcher2 | |
parent | e19bbca93eb93d4daaf31ac3e7bd8e4c32838af4 (diff) | |
download | android_packages_apps_Trebuchet-37990b4b4fc241fcf12a4b6d1725c69605b26605.tar.gz android_packages_apps_Trebuchet-37990b4b4fc241fcf12a4b6d1725c69605b26605.tar.bz2 android_packages_apps_Trebuchet-37990b4b4fc241fcf12a4b6d1725c69605b26605.zip |
Fix # 6925851: Workspace page spacing gets messed up
Change-Id: I694fa1e04049e35a415b1f1a85759e501fec6258
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 7d1724997..77cb46732 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -98,6 +98,7 @@ public class Workspace extends SmoothPagedView 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 class Workspace extends SmoothPagedView 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 @@ public class Workspace extends SmoothPagedView setLayoutScale(finalScaleFactor); } } else { - setPageSpacing(PagedView.AUTOMATIC_PAGE_SPACING); + setPageSpacing(mOriginalPageSpacing); setLayoutScale(1.0f); } |