diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-11-08 16:26:28 -0800 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2010-11-08 17:12:23 -0800 |
commit | 0ff229f29285cdbceaa72b008c10ddc9b00cd85c (patch) | |
tree | b7bff2f3361822c75554d80c42559d4916bb50cd /core/res | |
parent | 553a53ef9ff789dff8b5a74dfea4d6f37feeb263 (diff) | |
download | frameworks_base-0ff229f29285cdbceaa72b008c10ddc9b00cd85c.zip frameworks_base-0ff229f29285cdbceaa72b008c10ddc9b00cd85c.tar.gz frameworks_base-0ff229f29285cdbceaa72b008c10ddc9b00cd85c.tar.bz2 |
Tweak fragment animations to be more consistent with window anims.
Use same deceleration curves, same style for forward/backward nav.
Diffstat (limited to 'core/res')
-rw-r--r-- | core/res/res/anim/fragment_close_enter.xml | 9 | ||||
-rw-r--r-- | core/res/res/anim/fragment_close_exit.xml | 10 | ||||
-rw-r--r-- | core/res/res/anim/fragment_next_enter.xml | 6 | ||||
-rw-r--r-- | core/res/res/anim/fragment_next_exit.xml | 2 | ||||
-rw-r--r-- | core/res/res/anim/fragment_open_enter.xml | 8 | ||||
-rw-r--r-- | core/res/res/anim/fragment_open_exit.xml | 7 | ||||
-rw-r--r-- | core/res/res/anim/fragment_prev_enter.xml | 6 | ||||
-rw-r--r-- | core/res/res/anim/fragment_prev_exit.xml | 2 |
8 files changed, 24 insertions, 26 deletions
diff --git a/core/res/res/anim/fragment_close_enter.xml b/core/res/res/anim/fragment_close_enter.xml index edf1948..1c170e3 100644 --- a/core/res/res/anim/fragment_close_enter.xml +++ b/core/res/res/anim/fragment_close_enter.xml @@ -18,17 +18,10 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android"> <objectAnimator - android:interpolator="@anim/decelerate_interpolator" + android:interpolator="@anim/decelerate_cubic_interpolator" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:propertyName="alpha" android:duration="@android:integer/config_mediumAnimTime"/> - <objectAnimator - android:interpolator="@anim/decelerate_interpolator" - android:valueFrom="-100" - android:valueTo="0" - android:valueType="floatType" - android:propertyName="translationX" - android:duration="@android:integer/config_mediumAnimTime"/> </set>
\ No newline at end of file diff --git a/core/res/res/anim/fragment_close_exit.xml b/core/res/res/anim/fragment_close_exit.xml index fbba476..a084d63 100644 --- a/core/res/res/anim/fragment_close_exit.xml +++ b/core/res/res/anim/fragment_close_exit.xml @@ -18,17 +18,17 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android"> <objectAnimator - android:interpolator="@anim/accelerate_interpolator" + android:interpolator="@anim/decelerate_cubic_interpolator" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:propertyName="alpha" android:duration="@android:integer/config_mediumAnimTime"/> <objectAnimator - android:interpolator="@anim/accelerate_interpolator" - android:valueFrom="0" - android:valueTo="100" + android:interpolator="@anim/decelerate_quint_interpolator" + android:valueFrom="1" + android:valueTo=".8" android:valueType="floatType" - android:propertyName="translationX" + android:propertyName="scaleY" android:duration="@android:integer/config_mediumAnimTime"/> </set>
\ No newline at end of file diff --git a/core/res/res/anim/fragment_next_enter.xml b/core/res/res/anim/fragment_next_enter.xml index d2d6ec9..d3ff7a6 100644 --- a/core/res/res/anim/fragment_next_enter.xml +++ b/core/res/res/anim/fragment_next_enter.xml @@ -18,15 +18,17 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android"> <objectAnimator + android:interpolator="@anim/decelerate_cubic_interpolator" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:propertyName="alpha" - android:duration="@android:integer/config_longAnimTime"/> + android:duration="@android:integer/config_mediumAnimTime"/> <objectAnimator + android:interpolator="@anim/decelerate_quint_interpolator" android:valueFrom="50" android:valueTo="0" android:valueType="floatType" android:propertyName="translationY" - android:duration="@android:integer/config_longAnimTime"/> + android:duration="@android:integer/config_mediumAnimTime"/> </set>
\ No newline at end of file diff --git a/core/res/res/anim/fragment_next_exit.xml b/core/res/res/anim/fragment_next_exit.xml index fbb82d9..e08804f 100644 --- a/core/res/res/anim/fragment_next_exit.xml +++ b/core/res/res/anim/fragment_next_exit.xml @@ -18,12 +18,14 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android"> <objectAnimator + android:interpolator="@anim/decelerate_cubic_interpolator" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:propertyName="alpha" android:duration="@android:integer/config_mediumAnimTime"/> <objectAnimator + android:interpolator="@anim/decelerate_quint_interpolator" android:valueFrom="0" android:valueTo="-50" android:valueType="floatType" diff --git a/core/res/res/anim/fragment_open_enter.xml b/core/res/res/anim/fragment_open_enter.xml index 334f4ef..9e625a9 100644 --- a/core/res/res/anim/fragment_open_enter.xml +++ b/core/res/res/anim/fragment_open_enter.xml @@ -18,15 +18,17 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android"> <objectAnimator + android:interpolator="@anim/decelerate_cubic_interpolator" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:propertyName="alpha" android:duration="@android:integer/config_mediumAnimTime"/> <objectAnimator - android:valueFrom="100" - android:valueTo="0" + android:interpolator="@anim/decelerate_quint_interpolator" + android:valueFrom=".8" + android:valueTo="1" android:valueType="floatType" - android:propertyName="translationX" + android:propertyName="scaleY" android:duration="@android:integer/config_mediumAnimTime"/> </set>
\ No newline at end of file diff --git a/core/res/res/anim/fragment_open_exit.xml b/core/res/res/anim/fragment_open_exit.xml index 764fc39..d3278b2 100644 --- a/core/res/res/anim/fragment_open_exit.xml +++ b/core/res/res/anim/fragment_open_exit.xml @@ -18,15 +18,10 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android"> <objectAnimator + android:interpolator="@anim/decelerate_cubic_interpolator" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:propertyName="alpha" android:duration="@android:integer/config_mediumAnimTime"/> - <objectAnimator - android:valueFrom="0" - android:valueTo="-100" - android:valueType="floatType" - android:propertyName="translationX" - android:duration="@android:integer/config_mediumAnimTime"/> </set>
\ No newline at end of file diff --git a/core/res/res/anim/fragment_prev_enter.xml b/core/res/res/anim/fragment_prev_enter.xml index d37afd0..7ae41e6 100644 --- a/core/res/res/anim/fragment_prev_enter.xml +++ b/core/res/res/anim/fragment_prev_enter.xml @@ -18,15 +18,17 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android"> <objectAnimator + android:interpolator="@anim/decelerate_cubic_interpolator" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:propertyName="alpha" - android:duration="@android:integer/config_longAnimTime"/> + android:duration="@android:integer/config_mediumAnimTime"/> <objectAnimator + android:interpolator="@anim/decelerate_quint_interpolator" android:valueFrom="-50" android:valueTo="0" android:valueType="floatType" android:propertyName="translationY" - android:duration="@android:integer/config_longAnimTime"/> + android:duration="@android:integer/config_mediumAnimTime"/> </set>
\ No newline at end of file diff --git a/core/res/res/anim/fragment_prev_exit.xml b/core/res/res/anim/fragment_prev_exit.xml index a445a4d..a41f1aa 100644 --- a/core/res/res/anim/fragment_prev_exit.xml +++ b/core/res/res/anim/fragment_prev_exit.xml @@ -18,12 +18,14 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android"> <objectAnimator + android:interpolator="@anim/decelerate_cubic_interpolator" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:propertyName="alpha" android:duration="@android:integer/config_mediumAnimTime"/> <objectAnimator + android:interpolator="@anim/decelerate_quint_interpolator" android:valueFrom="0" android:valueTo="50" android:valueType="floatType" |