diff options
| author | Michael Jurka <mikejurka@google.com> | 2011-02-03 20:25:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-03 20:25:40 -0800 |
| commit | 409d841e8690804894e59cc747a128bd011bf665 (patch) | |
| tree | 2e5142a6830b6989a63d83ff07163ac807aad2ee /res | |
| parent | d7ecd3d70dd83eac9787e12ef3d7b9b238ec2a9d (diff) | |
| parent | de4149cf71b3fe8fb4a8e64b372ccd45dfb5fb00 (diff) | |
| download | android_packages_apps_Trebuchet-409d841e8690804894e59cc747a128bd011bf665.tar.gz android_packages_apps_Trebuchet-409d841e8690804894e59cc747a128bd011bf665.tar.bz2 android_packages_apps_Trebuchet-409d841e8690804894e59cc747a128bd011bf665.zip | |
am de4149cf: Merge "Tweaking feel of All Apps transition" into honeycomb
* commit 'de4149cf71b3fe8fb4a8e64b372ccd45dfb5fb00':
Tweaking feel of All Apps transition
Diffstat (limited to 'res')
| -rw-r--r-- | res/values-xlarge/config.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/res/values-xlarge/config.xml b/res/values-xlarge/config.xml index c6cd0e218..dc9d096f8 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">900</integer> + <integer name="config_allAppsZoomInTime">1450</integer> <!-- Duration in milliseconds of the transition between tabs in the all apps/customize tray --> @@ -17,10 +17,10 @@ <!-- 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">1400</integer> + <integer name="config_allAppsZoomOutTime">1200</integer> <!-- Scaling factor used in the all apps zooming animations --> - <integer name="config_allAppsZoomScaleFactor">10</integer> + <integer name="config_allAppsZoomScaleFactor">20</integer> <!-- Duration in milliseconds of the all apps / configuration zoom-in animation. --> <!-- NB: This should be less than the workspaceShrinkTime as they happen together. --> @@ -36,16 +36,16 @@ <!-- 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">400</integer> + <integer name="config_allAppsFadeOutTime">500</integer> <integer name="config_customizeWorkspaceShrinkTime">800</integer> - <integer name="config_allAppsWorkspaceShrinkTime">950</integer> - <integer name="config_workspaceUnshrinkTime">450</integer> + <integer name="config_allAppsWorkspaceShrinkTime">1450</integer> + <integer name="config_workspaceUnshrinkTime">650</integer> <!-- Duration in milliseconds toolbar fade in and fade out animations. NOTE: Fade in and fade out time should together be less the transition animations between all apps, customize, & the workspace. --> - <integer name="config_toolbarButtonFadeInTime">100</integer> - <integer name="config_toolbarButtonFadeOutTime">100</integer> + <integer name="config_toolbarButtonFadeInTime">350</integer> + <integer name="config_toolbarButtonFadeOutTime">200</integer> <!-- When dragging items on the workspace, how much bigger (in pixels) the dragged view should be, as compared to the original view. If 0, it will not be scaled at all. |