diff options
author | Adam Cohen <adamcohen@google.com> | 2014-08-11 15:42:28 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-09 00:40:15 +0000 |
commit | 6551b7ef07b4d73c096cbfb22002e080b498cbbb (patch) | |
tree | c99b07defc44f522cf51bdf9006c5bc7e139530c /src/com/android/launcher3/Workspace.java | |
parent | 5337aea1536c11e5bfef49a14297fd4649baa3a3 (diff) | |
parent | 4e243a2dad3700868035256af1882d7a4fee2385 (diff) | |
download | android_packages_apps_Trebuchet-6551b7ef07b4d73c096cbfb22002e080b498cbbb.tar.gz android_packages_apps_Trebuchet-6551b7ef07b4d73c096cbfb22002e080b498cbbb.tar.bz2 android_packages_apps_Trebuchet-6551b7ef07b4d73c096cbfb22002e080b498cbbb.zip |
Merge "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, 1 insertions, 9 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index f9fc14bb8..c8f2f33fb 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -210,7 +210,6 @@ 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; @@ -1692,20 +1691,13 @@ 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 || Float.compare(mLastOverscrollPivotX, pivotX) != 0) { + if (!mOverscrollTransformsSet) { mOverscrollTransformsSet = true; - mLastOverscrollPivotX = pivotX; - cl.setCameraDistance(mDensity * mCameraDistance); - cl.setPivotX(cl.getMeasuredWidth() * pivotX); - cl.setPivotY(cl.getMeasuredHeight() * 0.5f); cl.setOverscrollTransformsDirty(true); } } else { |