PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 37990b4b: Fix # 6925851: Workspace page spacing gets messed up

Browse Source 
* commit '37990b4b4fc241fcf12a4b6d1725c69605b26605':
  Fix # 6925851: Workspace page spacing gets messed up
This commit is contained in:
Michael Jurka
2012-09-25 15:46:35 -07:00
committed by Android Git Automerger
parent e49139e3da 37990b4b4f
commit e792db3ff6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/Workspace.java
+3 -1
View File
@@ -98,6 +98,7 @@ public class Workspace extends SmoothPagedView
private float mOverScrollMaxBackgroundAlpha = 0.0f; private float mOverScrollMaxBackgroundAlpha = 0.0f;
private float mWallpaperScrollRatio = 1.0f; private float mWallpaperScrollRatio = 1.0f;
private int mOriginalPageSpacing;
private final WallpaperManager mWallpaperManager; private final WallpaperManager mWallpaperManager;
private IBinder mWindowToken; private IBinder mWindowToken;
@@ -273,6 +274,7 @@ public class Workspace extends SmoothPagedView
public Workspace(Context context, AttributeSet attrs, int defStyle) { public Workspace(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle); super(context, attrs, defStyle);
mContentIsRefreshable = false; mContentIsRefreshable = false;
mOriginalPageSpacing = mPageSpacing;
mDragEnforcer = new DropTarget.DragEnforcer(context); mDragEnforcer = new DropTarget.DragEnforcer(context);
// With workspace, data is available straight from the get-go // With workspace, data is available straight from the get-go
@@ -1594,7 +1596,7 @@ public class Workspace extends SmoothPagedView
setLayoutScale(finalScaleFactor); setLayoutScale(finalScaleFactor);
} }
} else { } else {
setPageSpacing(PagedView.AUTOMATIC_PAGE_SPACING); setPageSpacing(mOriginalPageSpacing);
setLayoutScale(1.0f); setLayoutScale(1.0f);
} }