summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Burns <burnsra@gmail.com>2013-01-04 09:52:59 -0500
committerRobert Burns <burnsra@gmail.com>2013-01-04 09:52:59 -0500
commit95f418c36a4e14a8fec1764fcb888112d671022c (patch)
tree07a1f27951a7c601700faf6fdbda936aa00537aa
parent17c3cf4329eff87c52c22a3873291655ccd0db25 (diff)
downloadandroid_packages_apps_Trebuchet-95f418c36a4e14a8fec1764fcb888112d671022c.tar.gz
android_packages_apps_Trebuchet-95f418c36a4e14a8fec1764fcb888112d671022c.tar.bz2
android_packages_apps_Trebuchet-95f418c36a4e14a8fec1764fcb888112d671022c.zip
Fix vertical transition effects
- Accordian - Cylinder In/Out Change-Id: I94243c886eccaad4cbe8184cbfd7ac85ed477365
-rw-r--r--src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java22
1 files changed, 17 insertions, 5 deletions
diff --git a/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
index 8e52d4195..8d4e4d791 100644
--- a/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
+++ b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
@@ -1978,8 +1978,13 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
float scrollProgress = getScrollProgress(screenScroll, v, i);
float scale = 1.0f - Math.abs(scrollProgress);
- v.setPivotX(scrollProgress < 0 ? 0 : v.getMeasuredWidth());
- v.setScaleX(scale);
+ if (!mVertical) {
+ v.setPivotX(scrollProgress < 0 ? 0 : v.getMeasuredWidth());
+ v.setScaleX(scale);
+ } else {
+ v.setPivotY(scrollProgress < 0 ? 0 : v.getMeasuredHeight());
+ v.setScaleY(scale);
+ }
if (mFadeInAdjacentScreens) {
float alpha = 1 - Math.abs(scrollProgress);
@@ -2051,9 +2056,16 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
float scrollProgress = getScrollProgress(screenScroll, v, i);
float rotation = (in ? TRANSITION_SCREEN_ROTATION : -TRANSITION_SCREEN_ROTATION) * scrollProgress;
- v.setPivotX((scrollProgress + 1) * v.getMeasuredWidth() * 0.5f);
- v.setPivotY(v.getMeasuredHeight() * 0.5f);
- v.setRotationY(rotation);
+ if (!mVertical) {
+ v.setPivotX((scrollProgress + 1) * v.getMeasuredWidth() * 0.5f);
+ v.setPivotY(v.getMeasuredHeight() * 0.5f);
+ v.setRotationY(rotation);
+ } else {
+ v.setPivotY((scrollProgress + 1) * v.getMeasuredHeight() * 0.5f);
+ v.setPivotX(v.getMeasuredWidth() * 0.5f);
+ v.setRotationX(-rotation);
+ }
+
if (mFadeInAdjacentScreens) {
float alpha = 1 - Math.abs(scrollProgress);
v.setAlpha(alpha);