Merge "Tweaking home transitions" into honeycomb

2 files changed, 14 insertions, 9 deletions

diff --git a/res/values-xlarge/config.xml b/res/values-xlarge/config.xml
index 5a38e08..3e514fb 100644
--- a/res/values-xlarge/config.xml
+++ b/res/values-xlarge/config.xml
@@ -9,7 +9,7 @@
 
     <!-- Duration in milliseconds of the all apps / configuration zoom-in animation. -->
     <!-- NB: This should be less than the workspaceShrinkTime as they happen together. -->
-    <integer name="config_allAppsZoomInTime">850</integer>
+    <integer name="config_allAppsZoomInTime">800</integer>
 
     <!-- Duration in milliseconds of the transition between tabs in the all apps/customize
          tray -->
@@ -17,18 +17,18 @@
 
     <!-- Duration in milliseconds of the all apps zoom-out animation -->
     <!-- NB: This should be less than the workspaceUnshrinkTime as they happen together. -->
-    <integer name="config_allAppsZoomOutTime">500</integer>
+    <integer name="config_allAppsZoomOutTime">600</integer>
 
     <!-- Scaling factor used in the all apps zooming animations -->
     <integer name="config_allAppsZoomScaleFactor">10</integer>
 
     <!-- Duration in milliseconds of the all apps / configuration zoom-in animation. -->
     <!-- NB: This should be less than the workspaceShrinkTime as they happen together. -->
-    <integer name="config_customizeZoomInTime">700</integer>
+    <integer name="config_customizeZoomInTime">800</integer>
 
     <!-- Duration in milliseconds of the all apps zoom-out animation -->
     <!-- NB: This should be less than the workspaceUnshrinkTime as they happen together. -->
-    <integer name="config_customizeZoomOutTime">350</integer>
+    <integer name="config_customizeZoomOutTime">600</integer>
 
     <!-- Scaling factor used in the all apps zooming animations -->
     <integer name="config_customizeZoomScaleFactor">7</integer>
@@ -37,9 +37,9 @@
          NOTE: If these are changed, the toolbar animation times below should also be. -->
     <integer name="config_allAppsCameraPanTime">700</integer>
     <integer name="config_allAppsFadeOutTime">150</integer>
-    <integer name="config_customizeWorkspaceShrinkTime">700</integer>
+    <integer name="config_customizeWorkspaceShrinkTime">800</integer>
     <integer name="config_allAppsWorkspaceShrinkTime">800</integer>
-    <integer name="config_workspaceUnshrinkTime">350</integer>
+    <integer name="config_workspaceUnshrinkTime">450</integer>
 
     <!-- Duration in milliseconds toolbar fade in and fade out animations.
          NOTE: Fade in and fade out time should together be less the transition
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);