diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-01-17 16:59:08 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-17 16:59:08 -0800 |
| commit | 70ac092d86ed31241bd9d7a7d053dc2e1336a2a3 (patch) | |
| tree | 7ad8a1cec087d94ebc9bf873aba50f171c1e4edf /src/com | |
| parent | 4a7d4afe87a9146b3cefef8e00581090301b698d (diff) | |
| parent | 4904f66da8bdb9494487ad7a0528c18b0f13b8db (diff) | |
| download | packages_apps_trebuchet-70ac092d86ed31241bd9d7a7d053dc2e1336a2a3.zip packages_apps_trebuchet-70ac092d86ed31241bd9d7a7d053dc2e1336a2a3.tar.gz packages_apps_trebuchet-70ac092d86ed31241bd9d7a7d053dc2e1336a2a3.tar.bz2 | |
Merge "Tweaking home transitions" into honeycomb
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index a25db39..8f9c67e 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -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); |