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

Commit bc836514 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "QS: Icon animation update for existing animations." into lmp-mr1-dev

parents b836befe d7faa95f

packages/SystemUI/res/anim/ic_invert_colors_disable_animation_cross_1.xml

+13 −32
Original line number Diff line number Diff line
@@ -15,15 +15,6 @@ 
     limitations under the License.

-->

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

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="200"

            android:propertyName="pathData"

            android:valueFrom="M 7.54049682617,3.9430847168 c 0.0,0.0 0.324981689453,0.399978637695 0.324981689453,0.399978637695 "

            android:valueTo="M 7.54049682617,3.9430847168 c 0.0,0.0 0.324981689453,0.399978637695 0.324981689453,0.399978637695 "

            android:valueType="pathType"

            android:interpolator="@android:interpolator/linear" />

    <objectAnimator

        android:duration="350"

        android:propertyName="pathData"
@@ -31,15 +22,6 @@ 
        android:valueTo="M 7.54049682617,3.9430847168 c 0.0,0.0 31.5749816895,31.4499664307 31.5749816895,31.4499664307 "

        android:valueType="pathType"

        android:interpolator="@interpolator/ic_invert_colors_disable_cross_1_pathdata_interpolator" />

    </set>

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="200"

            android:propertyName="strokeAlpha"

            android:valueFrom="0"

            android:valueTo="0"

            android:interpolator="@android:interpolator/linear" />

    <objectAnimator

        android:duration="17"

        android:propertyName="strokeAlpha"
@@ -47,4 +29,3 @@ 
        android:valueTo="1"

        android:interpolator="@android:interpolator/linear" />

</set>
 
</set>

packages/SystemUI/res/anim/ic_invert_colors_disable_animation_mask.xml

+7 −17
Original line number Diff line number Diff line
@@ -15,15 +15,6 @@ 
     limitations under the License.

-->

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

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="200"

            android:propertyName="pathData"

            android:valueFrom="M 37.8337860107,-40.4599914551 c 0.0,0.0 -35.8077850342,31.5523681641 -35.8077850342,31.5523681641 c 0.0,0.0 9.55097961426,9.55285644531 9.55097961426,9.55285644531 c 0.0,0.0 -2.61698913574,2.09387207031 -2.61698913574,2.09387207031 c 0.0,0.0 -9.75096130371,-9.56428527832 -9.75096130371,-9.56428527832 c 0.0,0.0 -34.6200408936,25.4699249268 -34.6200408936,25.4699249268 c 0.0,0.0 55.9664764404,69.742401123 55.9664764404,69.742401123 c 0.0,0.0 73.2448120117,-59.1047973633 73.2448120117,-59.1047973633 c 0.0,0.0 -55.9664916992,-69.7423400879 -55.9664916992,-69.7423400879 Z"

            android:valueTo="M 37.8337860107,-40.4599914551 c 0.0,0.0 -35.8077850342,31.5523681641 -35.8077850342,31.5523681641 c 0.0,0.0 9.55097961426,9.55285644531 9.55097961426,9.55285644531 c 0.0,0.0 -2.61698913574,2.09387207031 -2.61698913574,2.09387207031 c 0.0,0.0 -9.75096130371,-9.56428527832 -9.75096130371,-9.56428527832 c 0.0,0.0 -34.6200408936,25.4699249268 -34.6200408936,25.4699249268 c 0.0,0.0 55.9664764404,69.742401123 55.9664764404,69.742401123 c 0.0,0.0 73.2448120117,-59.1047973633 73.2448120117,-59.1047973633 c 0.0,0.0 -55.9664916992,-69.7423400879 -55.9664916992,-69.7423400879 Z"

            android:valueType="pathType"

            android:interpolator="@android:interpolator/fast_out_slow_in" />

    <objectAnimator

        android:duration="350"

        android:propertyName="pathData"
@@ -32,4 +23,3 @@ 
        android:valueType="pathType"

        android:interpolator="@android:interpolator/fast_out_slow_in" />

</set>
 
</set>

packages/SystemUI/res/anim/ic_invert_colors_enable_animation_cross_1.xml

+8 −18
Original line number Diff line number Diff line
@@ -15,15 +15,6 @@ 
     limitations under the License.

-->

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

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="200"

            android:propertyName="pathData"

            android:valueFrom="M 7.54049682617,3.9430847168 c 0.0,0.0 31.5749816895,31.4499664307 31.5749816895,31.4499664307 "

            android:valueTo="M 7.54049682617,3.9430847168 c 0.0,0.0 31.5749816895,31.4499664307 31.5749816895,31.4499664307 "

            android:valueType="pathType"

            android:interpolator="@android:interpolator/linear" />

    <objectAnimator

        android:duration="350"

        android:propertyName="pathData"
@@ -31,11 +22,10 @@ 
        android:valueTo="M 7.54049682617,3.9430847168 c 0.0,0.0 0.324981689453,0.399978637695 0.324981689453,0.399978637695 "

        android:valueType="pathType"

        android:interpolator="@interpolator/ic_invert_colors_enable_cross_1_pathdata_interpolator" />

    </set>

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="533"

            android:duration="333"

            android:propertyName="strokeAlpha"

            android:valueFrom="1"

            android:valueTo="1"

packages/SystemUI/res/anim/ic_invert_colors_enable_animation_mask.xml

+7 −17
Original line number Diff line number Diff line
@@ -15,15 +15,6 @@ 
     limitations under the License.

-->

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

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="200"

            android:propertyName="pathData"

            android:valueFrom="M 37.8337860107,-40.3974914551 c 0.0,0.0 -35.8077850342,31.5523681641 -35.8077850342,31.5523681641 c 0.0,0.0 40.9884796143,40.9278411865 40.9884796143,40.9278411865 c 0.0,0.0 -2.61700439453,2.0938873291 -2.61700439453,2.0938873291 c 0.0,0.0 -41.1884460449,-40.9392852783 -41.1884460449,-40.9392852783 c 0.0,0.0 -34.6200408936,25.4699249268 -34.6200408936,25.4699249268 c 0.0,0.0 55.9664764404,69.742401123 55.9664764404,69.742401123 c 0.0,0.0 73.2448120117,-59.1047973633 73.2448120117,-59.1047973633 c 0.0,0.0 -55.9664916992,-69.7423400879 -55.9664916992,-69.7423400879 Z"

            android:valueTo="M 37.8337860107,-40.3974914551 c 0.0,0.0 -35.8077850342,31.5523681641 -35.8077850342,31.5523681641 c 0.0,0.0 40.9884796143,40.9278411865 40.9884796143,40.9278411865 c 0.0,0.0 -2.61700439453,2.0938873291 -2.61700439453,2.0938873291 c 0.0,0.0 -41.1884460449,-40.9392852783 -41.1884460449,-40.9392852783 c 0.0,0.0 -34.6200408936,25.4699249268 -34.6200408936,25.4699249268 c 0.0,0.0 55.9664764404,69.742401123 55.9664764404,69.742401123 c 0.0,0.0 73.2448120117,-59.1047973633 73.2448120117,-59.1047973633 c 0.0,0.0 -55.9664916992,-69.7423400879 -55.9664916992,-69.7423400879 Z"

            android:valueType="pathType"

            android:interpolator="@android:interpolator/linear" />

    <objectAnimator

        android:duration="350"

        android:propertyName="pathData"
@@ -32,4 +23,3 @@ 
        android:valueType="pathType"

        android:interpolator="@interpolator/ic_invert_colors_enable_mask_pathdata_interpolator" />

</set>
 
</set>

packages/SystemUI/res/anim/ic_landscape_from_auto_rotate_animation_arrow_bottom.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="567"

            android:duration="367"

            android:propertyName="fillAlpha"

            android:valueFrom="1"

            android:valueTo="1"