summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
authorMark Brophy <mbrophy@google.com>2014-08-11 12:37:00 +0000
committerMark Brophy <mbrophy@google.com>2014-08-11 12:37:00 +0000
commitfd0f02ce428880e7dc59ebc94717c3e25d22cbb7 (patch)
treef7a8c90e206701c2129eb5c7ed4956c265478329 /src/com/android/launcher3/Workspace.java
parentb172c13dcced9226c935991ef9fe85cc920ce811 (diff)
downloadandroid_packages_apps_Trebuchet-fd0f02ce428880e7dc59ebc94717c3e25d22cbb7.tar.gz
android_packages_apps_Trebuchet-fd0f02ce428880e7dc59ebc94717c3e25d22cbb7.tar.bz2
android_packages_apps_Trebuchet-fd0f02ce428880e7dc59ebc94717c3e25d22cbb7.zip
Revert "Updating the widget tray"
This reverts commit b172c13dcced9226c935991ef9fe85cc920ce811. Change-Id: I375fb105e3cf6fa2c1548306cf6a109d612077de
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r--src/com/android/launcher3/Workspace.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 20682ca93..7c8708b50 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -212,6 +212,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;
@@ -1693,13 +1694,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 {