PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 70ac092d: Merge "Tweaking home transitions" into honeycomb

Browse Source 
* commit '70ac092d86ed31241bd9d7a7d053dc2e1336a2a3':
  Tweaking home transitions
This commit is contained in:
Adam Cohen
2011-01-18 07:33:01 -08:00
committed by Android Git Automerger
parent 2b90c5778e 70ac092d86
commit 689f3c1c9d
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/values-xlarge/config.xml
+6 -6
View File
@@ -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
src/com/android/launcher2/Workspace.java
+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);