diff options
author | Adam Cohen <adamcohen@google.com> | 2014-08-10 18:30:55 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2014-08-11 15:40:37 +0000 |
commit | 4e243a2dad3700868035256af1882d7a4fee2385 (patch) | |
tree | 47545a50e089337b8c912ac8bd406970cdf6e7f1 /src/com/android/launcher3/Workspace.java | |
parent | 9bfdb76aaf5c8679b8f2ee3a9a3df2becefb947a (diff) | |
download | android_packages_apps_Trebuchet-4e243a2dad3700868035256af1882d7a4fee2385.tar.gz android_packages_apps_Trebuchet-4e243a2dad3700868035256af1882d7a4fee2385.tar.bz2 android_packages_apps_Trebuchet-4e243a2dad3700868035256af1882d7a4fee2385.zip |
Updating the widget tray
-> adding dark panel / associated visual updates
-> cleaning up the sizing / padding / to match all apps
-> fixing a couple things from previous CL
-> (removed Context#getDrawable() calls, L-only)
Change-Id: Ia65a6eb704b35f74e7305be9334c27971b22235a
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 7c8708b50..20682ca93 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -212,7 +212,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; @@ -1694,20 +1693,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 { |