diff options
| author | Adrian Roos <roosa@google.com> | 2014-11-18 20:32:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-18 20:32:28 +0000 |
| commit | 80c23e3c7f43065aabb5bf8c6f0859ba4a8c9ad7 (patch) | |
| tree | 5ab2a3aaea9ecc2a1f551440984d71ae2728a3d9 /core | |
| parent | 13b2497b62ecb51b37515d65e3f29f191d457505 (diff) | |
| parent | e672db2801c3eedbdf548c71dfa6cf048f91315d (diff) | |
| download | frameworks_base-80c23e3c7f43065aabb5bf8c6f0859ba4a8c9ad7.zip frameworks_base-80c23e3c7f43065aabb5bf8c6f0859ba4a8c9ad7.tar.gz frameworks_base-80c23e3c7f43065aabb5bf8c6f0859ba4a8c9ad7.tar.bz2 | |
am e672db28: am ed097689: Merge "Add animations for the system bar color views" into lmp-mr1-dev
* commit 'e672db2801c3eedbdf548c71dfa6cf048f91315d':
Add animations for the system bar color views
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/anim/dock_bottom_enter.xml | 2 | ||||
| -rw-r--r-- | core/res/res/anim/dock_bottom_exit.xml | 2 | ||||
| -rw-r--r-- | core/res/res/anim/dock_top_enter.xml | 2 | ||||
| -rw-r--r-- | core/res/res/anim/dock_top_exit.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/integers.xml | 1 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
6 files changed, 6 insertions, 4 deletions
diff --git a/core/res/res/anim/dock_bottom_enter.xml b/core/res/res/anim/dock_bottom_enter.xml index 4f2f753..bfb97b6 100644 --- a/core/res/res/anim/dock_bottom_enter.xml +++ b/core/res/res/anim/dock_bottom_enter.xml @@ -20,5 +20,5 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/decelerate_cubic"> <translate android:fromYDelta="100%" android:toYDelta="0" - android:duration="250"/> + android:duration="@integer/dock_enter_exit_duration"/> </set> diff --git a/core/res/res/anim/dock_bottom_exit.xml b/core/res/res/anim/dock_bottom_exit.xml index afbe24b..4e15448 100644 --- a/core/res/res/anim/dock_bottom_exit.xml +++ b/core/res/res/anim/dock_bottom_exit.xml @@ -20,5 +20,5 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/accelerate_cubic"> <translate android:fromYDelta="0" android:toYDelta="100%" - android:startOffset="100" android:duration="250"/> + android:startOffset="100" android:duration="@integer/dock_enter_exit_duration"/> </set> diff --git a/core/res/res/anim/dock_top_enter.xml b/core/res/res/anim/dock_top_enter.xml index 1f74e48..f763fb5 100644 --- a/core/res/res/anim/dock_top_enter.xml +++ b/core/res/res/anim/dock_top_enter.xml @@ -20,5 +20,5 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/decelerate_cubic"> <translate android:fromYDelta="-100%" android:toYDelta="0" - android:duration="250"/> + android:duration="@integer/dock_enter_exit_duration"/> </set> diff --git a/core/res/res/anim/dock_top_exit.xml b/core/res/res/anim/dock_top_exit.xml index 4d2fea9..995b7d0 100644 --- a/core/res/res/anim/dock_top_exit.xml +++ b/core/res/res/anim/dock_top_exit.xml @@ -20,5 +20,5 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/accelerate_cubic"> <translate android:fromYDelta="0" android:toYDelta="-100%" - android:startOffset="100" android:duration="250"/> + android:startOffset="100" android:duration="@integer/dock_enter_exit_duration"/> </set> diff --git a/core/res/res/values/integers.xml b/core/res/res/values/integers.xml index 0343cfa..8e27226 100644 --- a/core/res/res/values/integers.xml +++ b/core/res/res/values/integers.xml @@ -22,4 +22,5 @@ <integer name="button_pressed_animation_duration">100</integer> <integer name="button_pressed_animation_delay">100</integer> <integer name="disabled_alpha_animation_duration">100</integer> + <integer name="dock_enter_exit_duration">250</integer> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 702d5ed..802bbfa 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1848,6 +1848,7 @@ <java-symbol type="string" name="usb_storage_stop_title" /> <java-symbol type="string" name="usb_storage_title" /> <java-symbol type="style" name="Animation.RecentApplications" /> + <java-symbol type="integer" name="dock_enter_exit_duration" /> <!-- ImfTest --> <java-symbol type="layout" name="auto_complete_list" /> |