diff options
author | Chet Haase <chet@google.com> | 2010-09-07 13:20:00 -0700 |
---|---|---|
committer | Chet Haase <chet@google.com> | 2010-09-08 09:41:21 -0700 |
commit | a18a86b43e40e3c15dcca0ae0148d641be9b25fe (patch) | |
tree | 80f115b33fa69994f3cf7347d77c3463d1eda439 /core/res | |
parent | 789a47488c0e834eb80fe6b596dcc3e0ba7f1344 (diff) | |
download | frameworks_base-a18a86b43e40e3c15dcca0ae0148d641be9b25fe.zip frameworks_base-a18a86b43e40e3c15dcca0ae0148d641be9b25fe.tar.gz frameworks_base-a18a86b43e40e3c15dcca0ae0148d641be9b25fe.tar.bz2 |
Rename several animation classes
Change-Id: I6a4544875090db485163c8d56de8718f56d267c7
Diffstat (limited to 'core/res')
-rw-r--r-- | core/res/res/anim/animator_fade_in.xml | 2 | ||||
-rw-r--r-- | core/res/res/anim/animator_fade_out.xml | 2 | ||||
-rw-r--r-- | core/res/res/anim/fragment_close_enter.xml | 12 | ||||
-rw-r--r-- | core/res/res/anim/fragment_close_exit.xml | 12 | ||||
-rw-r--r-- | core/res/res/anim/fragment_open_enter.xml | 12 | ||||
-rw-r--r-- | core/res/res/anim/fragment_open_exit.xml | 12 | ||||
-rwxr-xr-x | core/res/res/values/attrs.xml | 8 |
7 files changed, 30 insertions, 30 deletions
diff --git a/core/res/res/anim/animator_fade_in.xml b/core/res/res/anim/animator_fade_in.xml index cd5042f..2a28b4d 100644 --- a/core/res/res/anim/animator_fade_in.xml +++ b/core/res/res/anim/animator_fade_in.xml @@ -17,7 +17,7 @@ */ --> -<property xmlns:android="http://schemas.android.com/apk/res/android" +<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@anim/accelerate_interpolator" android:valueFrom="0" android:valueTo="1" diff --git a/core/res/res/anim/animator_fade_out.xml b/core/res/res/anim/animator_fade_out.xml index dfb5d9c..4db6591 100644 --- a/core/res/res/anim/animator_fade_out.xml +++ b/core/res/res/anim/animator_fade_out.xml @@ -17,7 +17,7 @@ */ --> -<property xmlns:android="http://schemas.android.com/apk/res/android" +<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@anim/accelerate_interpolator" android:valueFrom="1.0" android:valueTo="0.0" diff --git a/core/res/res/anim/fragment_close_enter.xml b/core/res/res/anim/fragment_close_enter.xml index d4091e8..53afa2a 100644 --- a/core/res/res/anim/fragment_close_enter.xml +++ b/core/res/res/anim/fragment_close_enter.xml @@ -16,33 +16,33 @@ ** limitations under the License. */ --> -<sequencer xmlns:android="http://schemas.android.com/apk/res/android"> - <property +<set xmlns:android="http://schemas.android.com/apk/res/android"> + <objectAnimator android:interpolator="@anim/decelerate_interpolator" android:valueFrom="2" android:valueTo="1" android:valueType="floatType" android:propertyName="scaleX" android:duration="@android:integer/config_mediumAnimTime"/> - <property + <objectAnimator android:interpolator="@anim/decelerate_interpolator" android:valueFrom="2" android:valueTo="1" android:valueType="floatType" android:propertyName="scaleY" android:duration="@android:integer/config_mediumAnimTime"/> - <property + <objectAnimator android:interpolator="@anim/decelerate_interpolator" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:propertyName="alpha" android:duration="@android:integer/config_mediumAnimTime"/> - <property + <objectAnimator android:interpolator="@anim/decelerate_interpolator" android:valueFrom="-400" android:valueTo="0" android:valueType="floatType" android:propertyName="translationX" android:duration="@android:integer/config_mediumAnimTime"/> -</sequencer>
\ No newline at end of file +</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 3e2cd22..1554a4e 100644 --- a/core/res/res/anim/fragment_close_exit.xml +++ b/core/res/res/anim/fragment_close_exit.xml @@ -16,33 +16,33 @@ ** limitations under the License. */ --> -<sequencer xmlns:android="http://schemas.android.com/apk/res/android"> - <property +<set xmlns:android="http://schemas.android.com/apk/res/android"> + <objectAnimator android:interpolator="@anim/accelerate_interpolator" android:valueFrom="1" android:valueTo=".5" android:valueType="floatType" android:propertyName="scaleX" android:duration="@android:integer/config_mediumAnimTime"/> - <property + <objectAnimator android:interpolator="@anim/accelerate_interpolator" android:valueFrom="1" android:valueTo=".5" android:valueType="floatType" android:propertyName="scaleY" android:duration="@android:integer/config_mediumAnimTime"/> - <property + <objectAnimator android:interpolator="@anim/accelerate_interpolator" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:propertyName="alpha" android:duration="@android:integer/config_mediumAnimTime"/> - <property + <objectAnimator android:interpolator="@anim/accelerate_interpolator" android:valueFrom="0" android:valueTo="400" android:valueType="floatType" android:propertyName="translationX" android:duration="@android:integer/config_mediumAnimTime"/> -</sequencer>
\ No newline at end of file +</set>
\ No newline at end of file diff --git a/core/res/res/anim/fragment_open_enter.xml b/core/res/res/anim/fragment_open_enter.xml index c89001c..142f60c 100644 --- a/core/res/res/anim/fragment_open_enter.xml +++ b/core/res/res/anim/fragment_open_enter.xml @@ -16,31 +16,31 @@ ** limitations under the License. */ --> -<sequencer xmlns:android="http://schemas.android.com/apk/res/android"> - <property +<set xmlns:android="http://schemas.android.com/apk/res/android"> + <objectAnimator android:interpolator="@anim/decelerate_interpolator" android:valueFrom="2" android:valueTo="1" android:valueType="floatType" android:propertyName="scaleX" android:duration="@android:integer/config_mediumAnimTime"/> - <property + <objectAnimator android:interpolator="@anim/decelerate_interpolator" android:valueFrom="2" android:valueTo="1" android:valueType="floatType" android:propertyName="scaleY" android:duration="@android:integer/config_mediumAnimTime"/> - <property + <objectAnimator android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:propertyName="alpha" android:duration="@android:integer/config_mediumAnimTime"/> - <property + <objectAnimator android:valueFrom="400" android:valueTo="0" android:valueType="floatType" android:propertyName="translationX" android:duration="@android:integer/config_mediumAnimTime"/> -</sequencer>
\ No newline at end of file +</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 427fe4f..21260b9 100644 --- a/core/res/res/anim/fragment_open_exit.xml +++ b/core/res/res/anim/fragment_open_exit.xml @@ -16,31 +16,31 @@ ** limitations under the License. */ --> -<sequencer xmlns:android="http://schemas.android.com/apk/res/android"> - <property +<set xmlns:android="http://schemas.android.com/apk/res/android"> + <objectAnimator android:interpolator="@anim/accelerate_interpolator" android:valueFrom="1" android:valueTo="2" android:valueType="floatType" android:propertyName="scaleX" android:duration="@android:integer/config_mediumAnimTime"/> - <property + <objectAnimator android:interpolator="@anim/accelerate_interpolator" android:valueFrom="1" android:valueTo="2" android:valueType="floatType" android:propertyName="scaleY" android:duration="@android:integer/config_mediumAnimTime"/> - <property + <objectAnimator android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:propertyName="alpha" android:duration="@android:integer/config_mediumAnimTime"/> - <property + <objectAnimator android:valueFrom="0" android:valueTo="-400" android:valueType="floatType" android:propertyName="translationX" android:duration="@android:integer/config_mediumAnimTime"/> -</sequencer>
\ No newline at end of file +</set>
\ No newline at end of file diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 786e6b2..7b8d427 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -3010,7 +3010,7 @@ </declare-styleable> <!-- ========================== --> - <!-- Animator class attributes --> + <!-- ValueAnimator class attributes --> <!-- ========================== --> <eat-comment /> @@ -3047,7 +3047,7 @@ </declare-styleable> <!-- ========================== --> - <!-- PropertyAnimator class attributes --> + <!-- ObjectAnimator class attributes --> <!-- ========================== --> <eat-comment /> @@ -3058,11 +3058,11 @@ <!-- ========================== --> - <!-- Sequencer class attributes --> + <!-- AnimatorSet class attributes --> <!-- ========================== --> <eat-comment /> - <declare-styleable name="Sequencer"> + <declare-styleable name="AnimatorSet"> <!-- Name of the property being animated. --> <attr name="ordering"> <!-- child animations should be played together. --> |