summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-08-19 18:49:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-18 21:31:41 +0000
commit178879c72dad2b0dd85e77267281dee26907bfff (patch)
treec518e36d0c4ad2616c32304a1fbcef73cc77711f /res/values
parent800a4f217a5b0b7817a70a24974fc13d6b7e4591 (diff)
parentc4fe9ea11e82fe16d60525323464fd50cf391378 (diff)
downloadandroid_packages_apps_Trebuchet-178879c72dad2b0dd85e77267281dee26907bfff.tar.gz
android_packages_apps_Trebuchet-178879c72dad2b0dd85e77267281dee26907bfff.tar.bz2
android_packages_apps_Trebuchet-178879c72dad2b0dd85e77267281dee26907bfff.zip
Merge "Updating folder open transition for Material" into ub-now-porkchop
Diffstat (limited to 'res/values')
-rw-r--r--res/values/config.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/res/values/config.xml b/res/values/config.xml
index 0da0b7023..19ae44cc0 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -79,7 +79,9 @@
<integer name="config_dropAnimMaxDuration">500</integer>
<!-- The duration of the UserFolder opening and closing animation -->
- <integer name="config_folderAnimDuration">120</integer>
+ <integer name="config_folderExpandDuration">120</integer>
+ <integer name="config_materialFolderExpandDuration">200</integer>
+ <integer name="config_materialFolderExpandStagger">60</integer>
<!-- The distance at which the animation should take the max duration -->
<integer name="config_dropAnimMaxDist">800</integer>