Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9468503 authored by ztenghui's avatar ztenghui Committed by Android (Google) Code Review
Browse files

Merge changes I557e855f,I16d2ed29 

* changes:
  Add string support for valueFrom/valueTo
  Update the tests to show more animations from UX team
parents 80f7f108 66d3d8a0

core/res/res/values/attrs.xml

+2 −2
Original line number Diff line number Diff line
@@ -5447,9 +5447,9 @@ 
             greater than 0 or infinite. The default value is restart. -->

        <attr name="repeatMode"/>

        <!-- Value the animation starts from. -->

        <attr name="valueFrom" format="float|integer|color|dimension"/>

        <attr name="valueFrom" format="float|integer|color|dimension|string"/>

        <!-- Value the animation animates to. -->

        <attr name="valueTo" format="float|integer|color|dimension"/>

        <attr name="valueTo" format="float|integer|color|dimension|string"/>

        <!-- The type of valueFrom and valueTo. -->

        <attr name="valueType">

            <!-- valueFrom and valueTo are floats. This is the default value is valueType is

tests/VectorDrawableTest/res/anim/animation_favorite.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 Copyright (C) 2014 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<set xmlns:android="http://schemas.android.com/apk/res/android" >



    <objectAnimator

        android:duration="8000"

        android:interpolator="@interpolator/custom_path_interpolator_favorite"

        android:propertyName="pathData"

        android:repeatCount="-1"

        android:valueFrom="@string/round_box"

        android:valueTo="@string/heart"

        android:valueType="pathType" />



</set>
 
 No newline at end of file

tests/VectorDrawableTest/res/anim/animation_favorite02.xml

0 → 100644
+35 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 Copyright (C) 2014 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<set xmlns:android="http://schemas.android.com/apk/res/android" >



    <objectAnimator

        android:duration="8000"

        android:interpolator="@interpolator/custom_path_interpolator_favorite"

        android:propertyName="scaleX"

        android:repeatCount="-1"

        android:valueFrom="0"

        android:valueTo="20" />

    <objectAnimator

        android:duration="8000"

        android:interpolator="@interpolator/custom_path_interpolator_favorite"

        android:propertyName="scaleY"

        android:repeatCount="-1"

        android:valueFrom="0"

        android:valueTo="20" />



</set>
 
 No newline at end of file

tests/VectorDrawableTest/res/anim/animation_grouping_1_01.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 Copyright (C) 2014 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<set xmlns:android="http://schemas.android.com/apk/res/android" >



    <objectAnimator

        android:duration="3300"

        android:propertyName="rotation"

        android:valueFrom="0"

        android:valueTo="360"

        android:repeatCount="-1" />

</set>
 
 No newline at end of file

tests/VectorDrawableTest/res/anim/animation_grouping_1_02.xml

0 → 100644
+35 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 Copyright (C) 2014 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<set xmlns:android="http://schemas.android.com/apk/res/android" >



    <objectAnimator

        android:duration="2000"

        android:interpolator="@interpolator/custom_path_interpolator_favorite"

        android:propertyName="scaleX"

        android:repeatCount="-1"

        android:valueFrom="0"

        android:valueTo="20" />

    <objectAnimator

        android:duration="2000"

        android:interpolator="@interpolator/custom_path_interpolator_favorite"

        android:propertyName="scaleY"

        android:repeatCount="-1"

        android:valueFrom="0"

        android:valueTo="20" />



</set>
 
 No newline at end of file