diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-07-21 17:25:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-19 22:40:06 +0000 |
| commit | 82cc3fe6c77322d93ff74b25354e4bca77ab4a83 (patch) | |
| tree | 4fd03eb914c8c5d5c872b09b170382e9765a8a01 /res/values | |
| parent | ebf50c93b0d1a4f12329c92a3873a8409c566c7e (diff) | |
| parent | 6c5891a9fce95eee3d87823d11d21889743e9c68 (diff) | |
| download | android_packages_apps_Trebuchet-82cc3fe6c77322d93ff74b25354e4bca77ab4a83.tar.gz android_packages_apps_Trebuchet-82cc3fe6c77322d93ff74b25354e4bca77ab4a83.tar.bz2 android_packages_apps_Trebuchet-82cc3fe6c77322d93ff74b25354e4bca77ab4a83.zip | |
Merge "Preliminary work on Material Transitions" into ub-now-master
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/config.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index b512ffe67..3a862c504 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -22,7 +22,7 @@ <!-- AllApps/Customize/AppsCustomize --> <!-- The alpha of the AppsCustomize bg in spring loaded mode --> - <integer name="config_appsCustomizeSpringLoadedBgAlpha">65</integer> + <integer name="config_workspaceScrimAlpha">55</integer> <integer name="config_workspaceUnshrinkTime">300</integer> <integer name="config_overviewTransitionTime">250</integer> @@ -31,6 +31,7 @@ <!-- Fade/zoom in/out duration & scale in the AllApps transition. Note: This should be less than the workspaceShrinkTime as they happen together. --> + <integer name="config_appsCustomizeRevealTime">350</integer> <integer name="config_appsCustomizeZoomInTime">350</integer> <integer name="config_appsCustomizeZoomOutTime">600</integer> <integer name="config_appsCustomizeZoomScaleFactor">7</integer> |