diff options
| author | Winson Chung <winsonc@google.com> | 2014-04-04 17:28:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-04 17:28:53 +0000 |
| commit | 8906c16e5710e1f11ce43a4b03bd61f15876d325 (patch) | |
| tree | f78f0ba79c6d56776ddb0c3b511c80df0cf89e34 /packages/SystemUI/res | |
| parent | 1e474fe9b62dd8b6aeb2876789213b3ac0e40700 (diff) | |
| parent | e8cfc94ef624746c54a968d06c659c7f3b0b33f2 (diff) | |
| download | frameworks_base-8906c16e5710e1f11ce43a4b03bd61f15876d325.zip frameworks_base-8906c16e5710e1f11ce43a4b03bd61f15876d325.tar.gz frameworks_base-8906c16e5710e1f11ce43a4b03bd61f15876d325.tar.bz2 | |
am e8cfc94e: Merge "Fixing crash when filtering tasks too quickly."
* commit 'e8cfc94ef624746c54a968d06c659c7f3b0b33f2':
Fixing crash when filtering tasks too quickly.
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 5 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/dimens.xml | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 77ab17b..77944c8 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -107,5 +107,10 @@ <!-- milliseconds before the heads up notification accepts touches. --> <integer name="heads_up_sensitivity_delay">700</integer> + + <!-- The min animation duration for animating views that are currently visible. --> + <integer name="recents_filter_animate_current_views_min_duration">175</integer> + <!-- The min animation duration for animating views that are newly visible. --> + <integer name="recents_filter_animate_new_views_min_duration">125</integer> </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 1c6d5ad..2c8f9a1 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -236,6 +236,10 @@ <!-- The size of the activity icon in the recents task view. --> <dimen name="recents_task_view_activity_icon_size">60dp</dimen> + <!-- Used to calculate the translation animation duration, the expected amount of movement + in dps over one second of time. --> + <dimen name="recents_animation_movement_in_dps_per_second">800dp</dimen> + <!-- Space below the notification stack --> <dimen name="notification_stack_margin_bottom">0dp</dimen> |