diff options
| author | Winson Chung <winsonc@google.com> | 2014-10-01 20:03:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-01 20:03:19 +0000 |
| commit | d092fc7076310fca5edd089df5bb5398096f6627 (patch) | |
| tree | 8bf0c24e8b45f01e4d5242eb2a79c9892f5263b6 /packages/SystemUI/res | |
| parent | bf417b4d384d2c55609a87a6f0529d57918b2c55 (diff) | |
| parent | 9cb5c4e3854aa7f2ddab707920b688c3108cbc85 (diff) | |
| download | frameworks_base-d092fc7076310fca5edd089df5bb5398096f6627.zip frameworks_base-d092fc7076310fca5edd089df5bb5398096f6627.tar.gz frameworks_base-d092fc7076310fca5edd089df5bb5398096f6627.tar.bz2 | |
Merge "Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option" into lmp-dev
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 08bda1f..cd82c45 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -161,12 +161,9 @@ duration of the transition in to recents from home. --> <integer name="recents_animate_task_enter_from_home_delay">150</integer> <!-- The min animation duration for animating the task in when transitioning from home. --> - <integer name="recents_animate_task_enter_from_home_duration">200</integer> - <!-- The total animation stagger delay when entering from home. --> - <integer name="recents_animate_task_enter_from_home_stagger_delay">110</integer> - <!-- The total animation duration added to the last card when entering from home. - This value is partialy also added to the previous tasks --> - <integer name="recents_animate_task_enter_from_home_stagger_duration">72</integer> + <integer name="recents_animate_task_enter_from_home_duration">250</integer> + <!-- The animation stagger to apply to each task animation when transitioning from home. --> + <integer name="recents_animate_task_enter_from_home_stagger_delay">12</integer> <!-- The short duration when animating in/out the lock to app button. --> <integer name="recents_animate_lock_to_app_button_short_duration">150</integer> <!-- The long duration when animating in/out the lock to app button. --> |