aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing overscroll with single page (issue 10937081)

Browse Source 
-> Also fixing asymmetrical assets (10951956)
-> Also fixing camera distance to improve overscroll effect

Change-Id: If229c7b8a0c80073f6dea89d5fb009a0e2f5845f
This commit is contained in:
Adam Cohen
2013-09-26 14:29:35 -07:00
parent 93c9756e7a
commit a29f5047f0
6 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/launcher3/Workspace.java
View File

@@ -194,6 +194,7 @@ public class Workspace extends SmoothPagedView
private final int[] mTempXY = new int[2];
private int[] mTempVisiblePagesRange = new int[2];
private boolean mOverscrollTransformsSet;
private float mLastOverscrollPivotX;
public static final int DRAG_BITMAP_PADDING = 2;
private boolean mWorkspaceFadeInAdjacentScreens;
@@ -1413,22 +1414,20 @@ public class Workspace extends SmoothPagedView
final float rightBiasedPivot = 0.75f;
final int lowerIndex = 0;
final int upperIndex = getChildCount() - 1;
if (isRtl) {
index = mOverScrollX < 0 ? upperIndex : lowerIndex;
pivotX = (index == 0 ? leftBiasedPivot : rightBiasedPivot);
} else {
index = mOverScrollX < 0 ? lowerIndex : upperIndex;
pivotX = (index == 0 ? rightBiasedPivot : leftBiasedPivot);
}
final boolean isLeftPage = mOverScrollX < 0;
index = (!isRtl && isLeftPage) || (isRtl && !isLeftPage) ? lowerIndex : upperIndex;
pivotX = isLeftPage ? rightBiasedPivot : leftBiasedPivot;
CellLayout cl = (CellLayout) getChildAt(index);
float scrollProgress = getScrollProgress(screenCenter, cl, index);
final boolean isLeftPage = (isRtl ? index > 0 : index == 0);
cl.setOverScrollAmount(Math.abs(scrollProgress), isLeftPage);
float rotation = -WORKSPACE_OVERSCROLL_ROTATION * scrollProgress;
cl.setRotationY(rotation);
if (!mOverscrollTransformsSet) {
if (!mOverscrollTransformsSet || Float.compare(mLastOverscrollPivotX, pivotX) != 0) {
mOverscrollTransformsSet = true;
mLastOverscrollPivotX = pivotX;
cl.setCameraDistance(mDensity * mCameraDistance);
cl.setPivotX(cl.getMeasuredWidth() * pivotX);
cl.setPivotY(cl.getMeasuredHeight() * 0.5f);