Merge "Tweaking home transitions" into honeycomb

This commit is contained in:
Adam Cohen
2011-01-17 16:59:08 -08:00
committed by Android (Google) Code Review
2 changed files with 14 additions and 9 deletions
+8 -3
View File
@@ -1482,11 +1482,16 @@ public class Workspace extends SmoothPagedView
PropertyValuesHolder.ofFloat("backgroundAlpha", finalBackgroundAlpha),
PropertyValuesHolder.ofFloat("backgroundAlphaMultiplier",
finalAlphaMultiplierValue),
PropertyValuesHolder.ofFloat("alpha", finalAlphaValue),
PropertyValuesHolder.ofFloat("rotationY", rotation));
PropertyValuesHolder.ofFloat("alpha", finalAlphaValue));
animWithInterpolator.setDuration(duration);
animWithInterpolator.setInterpolator(mZoomInInterpolator);
mAnimator.playTogether(animWithInterpolator);
ObjectAnimator rotationAnim = ObjectAnimator.ofPropertyValuesHolder(cl,
PropertyValuesHolder.ofFloat("rotationY", rotation));
rotationAnim.setDuration(duration);
rotationAnim.setInterpolator(new DecelerateInterpolator(2.0f));
mAnimator.playTogether(animWithInterpolator, rotationAnim);
} else {
cl.setTranslationX(translation);
cl.setTranslationY(0.0f);