diff options
| author | Brandon Keely <lbk@google.com> | 2012-05-10 16:46:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-10 16:46:40 -0700 |
| commit | 86f23aaa7c86f57a381f49147e5a4454b82fc169 (patch) | |
| tree | dca83db8030a959b1acdafe3d5f0c8e860decf1a | |
| parent | fef47f422aef44a69aa1a417ef671d6934c5ed1f (diff) | |
| parent | 963daf28e51d788c2da2ea6c26602f4f9f7e0ed0 (diff) | |
| download | frameworks_base-86f23aaa7c86f57a381f49147e5a4454b82fc169.zip frameworks_base-86f23aaa7c86f57a381f49147e5a4454b82fc169.tar.gz frameworks_base-86f23aaa7c86f57a381f49147e5a4454b82fc169.tar.bz2 | |
Merge "fragment transitions" into jb-dev
| -rw-r--r-- | core/res/res/animator/fragment_close_enter.xml | 21 | ||||
| -rw-r--r-- | core/res/res/animator/fragment_close_exit.xml | 21 | ||||
| -rw-r--r-- | core/res/res/animator/fragment_open_enter.xml | 16 | ||||
| -rw-r--r-- | core/res/res/animator/fragment_open_exit.xml | 16 |
4 files changed, 24 insertions, 50 deletions
diff --git a/core/res/res/animator/fragment_close_enter.xml b/core/res/res/animator/fragment_close_enter.xml index c0abbc5..0b2e2cf 100644 --- a/core/res/res/animator/fragment_close_enter.xml +++ b/core/res/res/animator/fragment_close_enter.xml @@ -16,24 +16,11 @@ ** limitations under the License. */ --> -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:zAdjustment="normal"> - <objectAnimator - android:interpolator="@interpolator/decelerate_quint" - android:valueFrom="0.975" android:valueTo="1.0" - android:valueType="floatType" - android:propertyName="scaleY" - android:duration="@android:integer/config_activityDefaultDur"/> - <objectAnimator - android:interpolator="@interpolator/decelerate_quint" - android:valueFrom="0.975" android:valueTo="1.0" - android:valueType="floatType" - android:propertyName="scaleX" - android:duration="@android:integer/config_activityDefaultDur"/> - <objectAnimator - android:interpolator="@interpolator/decelerate_cubic" +<set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="normal"> + <objectAnimator + android:interpolator="@interpolator/decelerate_quad" android:valueFrom="0.0" android:valueTo="1.0" android:valueType="floatType" android:propertyName="alpha" - android:duration="@android:integer/config_activityDefaultDur"/> + android:duration="300"/> </set>
\ No newline at end of file diff --git a/core/res/res/animator/fragment_close_exit.xml b/core/res/res/animator/fragment_close_exit.xml index 9a5708c..e0ab607 100644 --- a/core/res/res/animator/fragment_close_exit.xml +++ b/core/res/res/animator/fragment_close_exit.xml @@ -16,24 +16,23 @@ ** limitations under the License. */ --> -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:zAdjustment="top"> - <objectAnimator - android:interpolator="@interpolator/decelerate_quint" - android:valueFrom="1.0" android:valueTo="1.075" +<set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="top"> + <objectAnimator + android:interpolator="@interpolator/decelerate_quad" + android:valueFrom="1.0" android:valueTo="0.8" android:valueType="floatType" android:propertyName="scaleY" - android:duration="@android:integer/config_activityDefaultDur"/> + android:duration="300"/> <objectAnimator - android:interpolator="@interpolator/decelerate_quint" - android:valueFrom="1.0" android:valueTo="1.075" + android:interpolator="@interpolator/decelerate_quad" + android:valueFrom="1.0" android:valueTo="0.8" android:valueType="floatType" android:propertyName="scaleX" - android:duration="@android:integer/config_activityDefaultDur"/> + android:duration="300"/> <objectAnimator - android:interpolator="@interpolator/decelerate_cubic" + android:interpolator="@interpolator/decelerate_quad" android:valueFrom="1.0" android:valueTo="0.0" android:valueType="floatType" android:propertyName="alpha" - android:duration="@android:integer/config_activityDefaultDur"/> + android:duration="300"/> </set>
\ No newline at end of file diff --git a/core/res/res/animator/fragment_open_enter.xml b/core/res/res/animator/fragment_open_enter.xml index 6b16cb4..8cd0e4e 100644 --- a/core/res/res/animator/fragment_open_enter.xml +++ b/core/res/res/animator/fragment_open_enter.xml @@ -17,22 +17,22 @@ */ --> <set xmlns:android="http://schemas.android.com/apk/res/android"> - <objectAnimator - android:interpolator="@interpolator/decelerate_quint" - android:valueFrom="1.125" android:valueTo="1.0" + <objectAnimator + android:interpolator="@interpolator/decelerate_cubic" + android:valueFrom="0.8" android:valueTo="1.0" android:valueType="floatType" android:propertyName="scaleY" - android:duration="@android:integer/config_activityDefaultDur"/> + android:duration="300"/> <objectAnimator - android:interpolator="@interpolator/decelerate_quint" - android:valueFrom="1.125" android:valueTo="1.0" + android:interpolator="@interpolator/decelerate_cubic" + android:valueFrom="0.8" android:valueTo="1.0" android:valueType="floatType" android:propertyName="scaleX" - android:duration="@android:integer/config_activityDefaultDur"/> + android:duration="300"/> <objectAnimator android:interpolator="@interpolator/decelerate_cubic" android:valueFrom="0.0" android:valueTo="1.0" android:valueType="floatType" android:propertyName="alpha" - android:duration="@android:integer/config_activityDefaultDur"/> + android:duration="300"/> </set>
\ No newline at end of file diff --git a/core/res/res/animator/fragment_open_exit.xml b/core/res/res/animator/fragment_open_exit.xml index d77ee8e..1b505fe 100644 --- a/core/res/res/animator/fragment_open_exit.xml +++ b/core/res/res/animator/fragment_open_exit.xml @@ -17,22 +17,10 @@ */ --> <set xmlns:android="http://schemas.android.com/apk/res/android"> - <objectAnimator - android:interpolator="@interpolator/linear" - android:valueFrom="1.0" android:valueTo="0.975" - android:valueType="floatType" - android:propertyName="scaleY" - android:duration="@android:integer/config_activityDefaultDur"/> - <objectAnimator - android:interpolator="@interpolator/linear" - android:valueFrom="1.0" android:valueTo="0.975" - android:valueType="floatType" - android:propertyName="scaleX" - android:duration="@android:integer/config_activityDefaultDur"/> - <objectAnimator + <objectAnimator android:interpolator="@interpolator/decelerate_cubic" android:valueFrom="1.0" android:valueTo="0.0" android:valueType="floatType" android:propertyName="alpha" - android:duration="@android:integer/config_activityDefaultDur"/> + android:duration="300"/> </set>
\ No newline at end of file |