diff options
author | Mark Brophy <mbrophy@google.com> | 2014-08-11 12:42:57 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-08 18:15:47 +0000 |
commit | 5337aea1536c11e5bfef49a14297fd4649baa3a3 (patch) | |
tree | c7ed85e7d1f17182475da9d336dae9c4257c221a /src/com/android/launcher3/Workspace.java | |
parent | d3ad9828d15f9c8fa435f2d59cd5a18e9ebee100 (diff) | |
parent | fd0f02ce428880e7dc59ebc94717c3e25d22cbb7 (diff) | |
download | android_packages_apps_Trebuchet-5337aea1536c11e5bfef49a14297fd4649baa3a3.tar.gz android_packages_apps_Trebuchet-5337aea1536c11e5bfef49a14297fd4649baa3a3.tar.bz2 android_packages_apps_Trebuchet-5337aea1536c11e5bfef49a14297fd4649baa3a3.zip |
Merge "Revert "Updating the widget tray"" into ub-now-porkchop
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index c8f2f33fb..f9fc14bb8 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -210,6 +210,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; @@ -1691,13 +1692,20 @@ public class Workspace extends SmoothPagedView 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); 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); cl.setOverscrollTransformsDirty(true); } } else { |