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

Commit 88324b47 authored by Budi Kusmiantoro's avatar Budi Kusmiantoro
Browse files

Speed up clock tab icon animation 

Bug: 17752656
Change-Id: I0c32c457bec93a6d400f3e98ef7f8a84c46452f3
parent a7e46cb0

res/animator/ic_time_hour_hand_animation.xml→res/animator/ic_clock_hour_hand_animation.xml

100755 → 100644
+27 −27
Original line number Diff line number Diff line
@@ -20,165 +20,165 @@ 
    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="266"

            android:duration="166"

            android:propertyName="translateX"

            android:valueFrom="117.75"

            android:valueTo="116.68351"

            android:valueType="floatType"

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

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

        <objectAnimator

            android:duration="66"

            android:duration="41"

            android:propertyName="translateX"

            android:valueFrom="116.68351"

            android:valueTo="116.2544"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="266"

            android:duration="166"

            android:propertyName="translateX"

            android:valueFrom="116.2544"

            android:valueTo="115.10072"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:duration="20"

            android:propertyName="translateX"

            android:valueFrom="115.10072"

            android:valueTo="114.59167"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:duration="20"

            android:propertyName="translateX"

            android:valueFrom="114.59167"

            android:valueTo="114.07271"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:duration="20"

            android:propertyName="translateX"

            android:valueFrom="114.07271"

            android:valueTo="113.92814"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:duration="20"

            android:propertyName="translateX"

            android:valueFrom="113.92814"

            android:valueTo="114.75237"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:duration="20"

            android:propertyName="translateX"

            android:valueFrom="114.75237"

            android:valueTo="114.32657"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:duration="20"

            android:propertyName="translateX"

            android:valueFrom="114.32657"

            android:valueTo="114.52556"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="133"

            android:duration="83"

            android:propertyName="translateX"

            android:valueFrom="114.52556"

            android:valueTo="114.26022"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="399"

            android:duration="250"

            android:propertyName="translateX"

            android:valueFrom="114.26022"

            android:valueTo="114.25"

            android:valueType="floatType"

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

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

    </set>

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="266"

            android:duration="166"

            android:propertyName="translateY"

            android:valueFrom="128.25"

            android:valueTo="128.05357"

            android:valueType="floatType"

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

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

        <objectAnimator

            android:duration="66"

            android:duration="41"

            android:propertyName="translateY"

            android:valueFrom="128.05357"

            android:valueTo="127.39493"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="266"

            android:duration="166"

            android:propertyName="translateY"

            android:valueFrom="127.39493"

            android:valueTo="125.76069"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:duration="20"

            android:propertyName="translateY"

            android:valueFrom="125.76069"

            android:valueTo="125.76442"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:duration="20"

            android:propertyName="translateY"

            android:valueFrom="125.76442"

            android:valueTo="125.38347"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:duration="20"

            android:propertyName="translateY"

            android:valueFrom="125.38347"

            android:valueTo="125.00182"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:duration="20"

            android:propertyName="translateY"

            android:valueFrom="125.00182"

            android:valueTo="125.27592"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:duration="20"

            android:propertyName="translateY"

            android:valueFrom="125.27592"

            android:valueTo="125.10044"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:duration="20"

            android:propertyName="translateY"

            android:valueFrom="125.10044"

            android:valueTo="124.92464"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="133"

            android:duration="83"

            android:propertyName="translateY"

            android:valueFrom="124.92464"

            android:valueTo="124.41091"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="399"

            android:duration="250"

            android:propertyName="translateY"

            android:valueFrom="124.41091"

            android:valueTo="124.0"

            android:valueType="floatType"

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

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

    </set>

    <objectAnimator

        android:duration="1333"

        android:duration="833"

        android:propertyName="rotation"

        android:valueFrom="0.0"

        android:valueTo="121.0"

res/animator/ic_time_minute_hand_animation.xml→res/animator/ic_clock_minute_hand_animation.xml

100755 → 100644
+23 −23
Original line number Diff line number Diff line
@@ -20,137 +20,137 @@ 
    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="266"

            android:duration="166"

            android:propertyName="translateX"

            android:valueFrom="114.25"

            android:valueTo="115.55177"

            android:valueType="floatType"

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

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

        <objectAnimator

            android:duration="66"

            android:duration="41"

            android:propertyName="translateX"

            android:valueFrom="115.55177"

            android:valueTo="115.93416"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="266"

            android:duration="166"

            android:propertyName="translateX"

            android:valueFrom="115.93416"

            android:valueTo="116.58852"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:duration="20"

            android:propertyName="translateX"

            android:valueFrom="116.58852"

            android:valueTo="116.84771"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="66"

            android:duration="41"

            android:propertyName="translateX"

            android:valueFrom="116.84771"

            android:valueTo="117.11524"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:duration="20"

            android:propertyName="translateX"

            android:valueFrom="117.11524"

            android:valueTo="117.37431"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="66"

            android:duration="41"

            android:propertyName="translateX"

            android:valueFrom="117.37431"

            android:valueTo="117.41381"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="133"

            android:duration="83"

            android:propertyName="translateX"

            android:valueFrom="117.41381"

            android:valueTo="117.74111"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="399"

            android:duration="250"

            android:propertyName="translateX"

            android:valueFrom="117.74111"

            android:valueTo="117.75"

            android:valueType="floatType"

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

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

    </set>

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="266"

            android:duration="166"

            android:propertyName="translateY"

            android:valueFrom="124.0"

            android:valueTo="124.26329"

            android:valueType="floatType"

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

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

        <objectAnimator

            android:duration="66"

            android:duration="41"

            android:propertyName="translateY"

            android:valueFrom="124.26329"

            android:valueTo="124.88398"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="266"

            android:duration="166"

            android:propertyName="translateY"

            android:valueFrom="124.88398"

            android:valueTo="125.80391"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:duration="20"

            android:propertyName="translateY"

            android:valueFrom="125.80391"

            android:valueTo="126.13012"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="66"

            android:duration="41"

            android:propertyName="translateY"

            android:valueFrom="126.13012"

            android:valueTo="125.9482"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:duration="20"

            android:propertyName="translateY"

            android:valueFrom="125.9482"

            android:valueTo="126.92025"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="66"

            android:duration="41"

            android:propertyName="translateY"

            android:valueFrom="126.92025"

            android:valueTo="127.00955"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="133"

            android:duration="83"

            android:propertyName="translateY"

            android:valueFrom="127.00955"

            android:valueTo="127.62279"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="399"

            android:duration="250"

            android:propertyName="translateY"

            android:valueFrom="127.62279"

            android:valueTo="128.25"

            android:valueType="floatType"

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

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

    </set>

    <objectAnimator

        android:duration="1333"

        android:duration="833"

        android:propertyName="rotation"

        android:valueFrom="121.0"

        android:valueTo="360.0"

res/drawable-v22/ic_tab_clock.xml

+2 −3
Original line number Diff line number Diff line
@@ -30,13 +30,12 @@ 
        <animated-vector android:drawable="@drawable/ic_clock">

            <target

                android:name="hour_hand"

                android:animation="@animator/ic_time_hour_hand_animation" />

                android:animation="@animator/ic_clock_hour_hand_animation" />

            <target

                android:name="minute_hand"

                android:animation="@animator/ic_time_minute_hand_animation" />

                android:animation="@animator/ic_clock_minute_hand_animation" />

        </animated-vector>

    </transition>





</animated-selector>