summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-01-27 20:32:17 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-27 20:32:17 -0800
commitd271c0a01121fe857769734c3d3e14ebdf05bf84 (patch)
tree135f3fb0ae36459a01108ced9678a2cfc7c2265f /res
parent95ba4448cd26ffb032b5e230dbd8fac516bd9589 (diff)
parent1af432a1873b0b818e9613a26b0d5ce536f697a2 (diff)
downloadandroid_packages_apps_Trebuchet-d271c0a01121fe857769734c3d3e14ebdf05bf84.tar.gz
android_packages_apps_Trebuchet-d271c0a01121fe857769734c3d3e14ebdf05bf84.tar.bz2
android_packages_apps_Trebuchet-d271c0a01121fe857769734c3d3e14ebdf05bf84.zip
am 1af432a1: am 860f4c5a: Final tweaks for home animations
* commit '1af432a1873b0b818e9613a26b0d5ce536f697a2': Final tweaks for home animations
Diffstat (limited to 'res')
-rw-r--r--res/values-xlarge/config.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/res/values-xlarge/config.xml b/res/values-xlarge/config.xml
index 242e96aac..d5da5933a 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">800</integer>
+ <integer name="config_allAppsZoomInTime">900</integer>
<!-- Duration in milliseconds of the transition between tabs in the all apps/customize
tray -->
@@ -17,7 +17,7 @@
<!-- 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">600</integer>
+ <integer name="config_allAppsZoomOutTime">1400</integer>
<!-- Scaling factor used in the all apps zooming animations -->
<integer name="config_allAppsZoomScaleFactor">10</integer>
@@ -36,9 +36,9 @@
<!-- Duration in milliseconds of the animations between all apps, customize, & home.
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_allAppsFadeOutTime">400</integer>
<integer name="config_customizeWorkspaceShrinkTime">800</integer>
- <integer name="config_allAppsWorkspaceShrinkTime">800</integer>
+ <integer name="config_allAppsWorkspaceShrinkTime">950</integer>
<integer name="config_workspaceUnshrinkTime">450</integer>
<!-- Duration in milliseconds toolbar fade in and fade out animations.