summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2013-06-22 19:36:55 (GMT)
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-06-22 19:36:55 (GMT)
commit7607c34991b099f3e5553b69ef4875455beb46a5 (patch)
treea9d20cdcdfdbf77c1adb007341efed6c38d40ed9
parent39060740ee6679a4c6e1757ea78b1b34233eb24e (diff)
parentf42063810cca82d0beef501510cb0a6f2a732541 (diff)
downloadandroid_packages_apps_Trebuchet-7607c34991b099f3e5553b69ef4875455beb46a5.zip
android_packages_apps_Trebuchet-7607c34991b099f3e5553b69ef4875455beb46a5.tar.gz
android_packages_apps_Trebuchet-7607c34991b099f3e5553b69ef4875455beb46a5.tar.bz2
Merge "Trebuchet: Fix stack effect" into cm-10.1
-rw-r--r--src/com/cyanogenmod/trebuchet/Workspace.java21
1 files changed, 19 insertions, 2 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java
index a6f9154..20b9953 100644
--- a/src/com/cyanogenmod/trebuchet/Workspace.java
+++ b/src/com/cyanogenmod/trebuchet/Workspace.java
@@ -1566,16 +1566,17 @@ public class Workspace extends PagedView
// On large screens we need to fade the page as it nears its leftmost position
alpha = mLeftScreenAlphaInterpolator.getInterpolation(1 - scrollProgress);
}
-
cl.setTranslationX(translationX);
cl.setScaleX(scale);
cl.setScaleY(scale);
cl.setAlpha(alpha);
// If the view has 0 alpha, we set it to be invisible so as to prevent
- // it from accepting touches
+ // it from accepting touches. Move the view to its original position to
+ // prevent overlap between views
if (alpha <= 0) {
cl.setVisibility(INVISIBLE);
+ cl.setTranslationX(0);
} else if (cl.getVisibility() != VISIBLE) {
cl.setVisibility(VISIBLE);
}
@@ -2231,8 +2232,16 @@ public class Workspace extends PagedView
if (mTransitionEffect == TransitionEffect.Stack) {
if (i <= mCurrentPage) {
cl.setVisibility(VISIBLE);
+ cl.setAlpha(1.0f);
+ if (mFadeInAdjacentScreens) {
+ setCellLayoutFadeAdjacent(cl, 0.0f);
+ }
} else {
cl.setVisibility(INVISIBLE);
+ cl.setAlpha(0.0f);
+ if (mFadeInAdjacentScreens) {
+ setCellLayoutFadeAdjacent(cl, 1.0f);
+ }
}
}
@@ -2294,6 +2303,14 @@ public class Workspace extends PagedView
cl.setPivotX(cl.getMeasuredWidth() * 0.5f);
cl.setPivotY(cl.getMeasuredHeight() * 0.5f);
cl.setVisibility(VISIBLE);
+
+ // Stack Effect
+ if (mTransitionEffect == TransitionEffect.Stack) {
+ cl.setAlpha(1.0f);
+ if (mFadeInAdjacentScreens) {
+ setCellLayoutFadeAdjacent(cl, 0.0f);
+ }
+ }
}
// Determine the pages alpha during the state transition