summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-01-17 16:50:28 -0800
committerAdam Cohen <adamcohen@google.com>2011-01-17 16:51:38 -0800
commit4904f66da8bdb9494487ad7a0528c18b0f13b8db (patch)
treebbd5bdda550733e5cd4c3f85cbee0ddb690db089 /src/com
parent0d5aad7edbed3ed5c13904cc13ec8842ffe8837b (diff)
downloadpackages_apps_trebuchet-4904f66da8bdb9494487ad7a0528c18b0f13b8db.zip
packages_apps_trebuchet-4904f66da8bdb9494487ad7a0528c18b0f13b8db.tar.gz
packages_apps_trebuchet-4904f66da8bdb9494487ad7a0528c18b0f13b8db.tar.bz2
Tweaking home transitions
Change-Id: I72e292f40043ba6eca749191e2672847c8ec1de5
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher2/Workspace.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 7ed19b9..ef99406 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);