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

Commit a7e46cb0 authored by Budi Kusmiantoro's avatar Budi Kusmiantoro
Browse files

Update clock tab icon animation 

Bug: 17752656
Change-Id: I64e06bf7c0262a7d389fb719ff06917a2e559e8e
parent b04b1555

res/animator/ic_time_hour_hand_animation.xml

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

<!--

     Copyright (C) 2015 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" >

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="266"

            android:propertyName="translateX"

            android:valueFrom="117.75"

            android:valueTo="116.68351"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="66"

            android:propertyName="translateX"

            android:valueFrom="116.68351"

            android:valueTo="116.2544"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="266"

            android:propertyName="translateX"

            android:valueFrom="116.2544"

            android:valueTo="115.10072"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:propertyName="translateX"

            android:valueFrom="115.10072"

            android:valueTo="114.59167"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:propertyName="translateX"

            android:valueFrom="114.59167"

            android:valueTo="114.07271"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:propertyName="translateX"

            android:valueFrom="114.07271"

            android:valueTo="113.92814"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:propertyName="translateX"

            android:valueFrom="113.92814"

            android:valueTo="114.75237"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:propertyName="translateX"

            android:valueFrom="114.75237"

            android:valueTo="114.32657"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:propertyName="translateX"

            android:valueFrom="114.32657"

            android:valueTo="114.52556"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="133"

            android:propertyName="translateX"

            android:valueFrom="114.52556"

            android:valueTo="114.26022"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="399"

            android:propertyName="translateX"

            android:valueFrom="114.26022"

            android:valueTo="114.25"

            android:valueType="floatType"

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

    </set>

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="266"

            android:propertyName="translateY"

            android:valueFrom="128.25"

            android:valueTo="128.05357"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="66"

            android:propertyName="translateY"

            android:valueFrom="128.05357"

            android:valueTo="127.39493"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="266"

            android:propertyName="translateY"

            android:valueFrom="127.39493"

            android:valueTo="125.76069"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:propertyName="translateY"

            android:valueFrom="125.76069"

            android:valueTo="125.76442"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:propertyName="translateY"

            android:valueFrom="125.76442"

            android:valueTo="125.38347"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:propertyName="translateY"

            android:valueFrom="125.38347"

            android:valueTo="125.00182"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:propertyName="translateY"

            android:valueFrom="125.00182"

            android:valueTo="125.27592"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:propertyName="translateY"

            android:valueFrom="125.27592"

            android:valueTo="125.10044"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:propertyName="translateY"

            android:valueFrom="125.10044"

            android:valueTo="124.92464"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="133"

            android:propertyName="translateY"

            android:valueFrom="124.92464"

            android:valueTo="124.41091"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="399"

            android:propertyName="translateY"

            android:valueFrom="124.41091"

            android:valueTo="124.0"

            android:valueType="floatType"

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

    </set>

    <objectAnimator

        android:duration="1333"

        android:propertyName="rotation"

        android:valueFrom="0.0"

        android:valueTo="121.0"

        android:valueType="floatType"

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

</set>

res/animator/ic_time_minute_hand_animation.xml

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

<!--

     Copyright (C) 2015 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" >

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="266"

            android:propertyName="translateX"

            android:valueFrom="114.25"

            android:valueTo="115.55177"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="66"

            android:propertyName="translateX"

            android:valueFrom="115.55177"

            android:valueTo="115.93416"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="266"

            android:propertyName="translateX"

            android:valueFrom="115.93416"

            android:valueTo="116.58852"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:propertyName="translateX"

            android:valueFrom="116.58852"

            android:valueTo="116.84771"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="66"

            android:propertyName="translateX"

            android:valueFrom="116.84771"

            android:valueTo="117.11524"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:propertyName="translateX"

            android:valueFrom="117.11524"

            android:valueTo="117.37431"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="66"

            android:propertyName="translateX"

            android:valueFrom="117.37431"

            android:valueTo="117.41381"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="133"

            android:propertyName="translateX"

            android:valueFrom="117.41381"

            android:valueTo="117.74111"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="399"

            android:propertyName="translateX"

            android:valueFrom="117.74111"

            android:valueTo="117.75"

            android:valueType="floatType"

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

    </set>

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="266"

            android:propertyName="translateY"

            android:valueFrom="124.0"

            android:valueTo="124.26329"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="66"

            android:propertyName="translateY"

            android:valueFrom="124.26329"

            android:valueTo="124.88398"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="266"

            android:propertyName="translateY"

            android:valueFrom="124.88398"

            android:valueTo="125.80391"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:propertyName="translateY"

            android:valueFrom="125.80391"

            android:valueTo="126.13012"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="66"

            android:propertyName="translateY"

            android:valueFrom="126.13012"

            android:valueTo="125.9482"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="33"

            android:propertyName="translateY"

            android:valueFrom="125.9482"

            android:valueTo="126.92025"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="66"

            android:propertyName="translateY"

            android:valueFrom="126.92025"

            android:valueTo="127.00955"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="133"

            android:propertyName="translateY"

            android:valueFrom="127.00955"

            android:valueTo="127.62279"

            android:valueType="floatType"

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

        <objectAnimator

            android:duration="399"

            android:propertyName="translateY"

            android:valueFrom="127.62279"

            android:valueTo="128.25"

            android:valueType="floatType"

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

    </set>

    <objectAnimator

        android:duration="1333"

        android:propertyName="rotation"

        android:valueFrom="121.0"

        android:valueTo="360.0"

        android:valueType="floatType"

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

</set>

res/drawable-v22/ic_tab_clock.xml

+5 −2
Original line number Diff line number Diff line
@@ -29,8 +29,11 @@ 
    <transition android:fromId="@id/off" android:toId="@id/on">

        <animated-vector android:drawable="@drawable/ic_clock">

            <target

                android:name="second_hand"

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

                android:name="hour_hand"

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

            <target

                android:name="minute_hand"

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

        </animated-vector>

    </transition>

res/drawable/ic_clock.xml

100644 → 100755
+50 −31
Original line number Diff line number Diff line
@@ -15,54 +15,73 @@ 
     limitations under the License.

-->



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

    android:height="24dp"

    android:width="24dp"

    android:viewportHeight="24"

    android:viewportWidth="24" >

<vector

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

    android:name="ic_clock"

    android:width="240dp"

    android:viewportWidth="240"

    android:height="240dp"

    android:viewportHeight="240" >

    <group

        android:name="clock_frame"

        android:translateX="12"

        android:translateY="12" >

        android:translateX="120"

        android:translateY="120"

        android:scaleX="9.91"

        android:scaleY="9.91" >

        <group

            android:name="clock_frame_pivot"

            android:translateX="-12"

            android:translateY="-12" >

            <group

                android:name="hour_hand"

                android:translateX="12.00763"

                android:translateY="9.992" >

                android:name="clock_frame_0"

                android:translateX="12"

                android:translateY="12" >

                <path

                    android:name="hour_hand_path"

                    android:pathData="M 0.742004394531,2.99200439453 c 0.0,0.0 -1.48400878906,0.0 -1.48400878906,0.0 c 0.0,0.0 0.0,-5.98400878906 0.0,-5.98400878906 c 0.0,0.0 1.48400878906,0.0 1.48400878906,0.0 c 0.0,0.0 0.0,5.98400878906 0.0,5.98400878906 Z"

                    android:fillColor="#FFFFFFFF"

                    android:fillAlpha="1" />

                    android:name="clock_ouline_path_merged"

                    android:pathData="M -0.0050048828125,-10.0 c -5.52699279785,0.0 -9.99499511719,4.47700500488 -9.99499511719,10.0 c 0.0,5.52299499512 4.46800231934,10.0 9.99499511719,10.0 c 5.52600097656,0.0 10.0050048828,-4.47700500488 10.0050048828,-10.0 c 0.0,-5.52299499512 -4.47900390625,-10.0 -10.0050048828,-10.0 Z M 0.0,8.0 c -4.41999816895,0.0 -8.0,-3.58200073242 -8.0,-8.0 c 0.0,-4.41799926758 3.58000183105,-8.0 8.0,-8.0 c 4.41999816895,0.0 8.0,3.58200073242 8.0,8.0 c 0.0,4.41799926758 -3.58000183105,8.0 -8.0,8.0 Z"

                    android:fillColor="#FFFFFFFF" />

            </group>

        </group>

    </group>

    <group

                android:name="clock_frame_1"

                android:translateX="12"

                android:translateY="12" >

        android:name="hour_hand"

        android:translateX="117.75"

        android:translateY="128.25"

        android:scaleX="0.91922"

        android:scaleY="3.67245" >

        <group

            android:name="hour_hand_pivot"

            android:translateY="-7.69241" >

            <group

                android:name="hour_hand_0"

                android:translateX="-0.25"

                android:translateY="-0.125" >

                <path

                    android:name="clock_ouline_path"

                    android:pathData="M -0.0050048828125,-10 c -5.52699279785,0 -9.99499511719,4.47700500488 -9.99499511719,10 c 0,5.52299499512 4.46800231934,10 9.99499511719,10 c 5.52600097656,0 10.0050048828,-4.47700500488 10.0050048828,-10 c 0,-5.52299499512 -4.47900390625,-10 -10.0050048828,-10 Z M 0,8 c -4.41999816895,0 -8,-3.58200073242 -8,-8 c 0,-4.41799926758 3.58000183105,-8 8,-8 c 4.41999816895,0 8,3.58200073242 8,8 c 0,4.41799926758 -3.58000183105,8 -8,8 Z"

                    android:name="hour_hand_path"

                    android:fillColor="#FFFFFFFF"

                    android:fillAlpha="1" />

                    android:pathData="M -7.986815,-7.986815 l 15.97363,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,15.97363 c 0.0,0.0 0.0,0.0 0.0,0.0 l -15.97363,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-15.97363 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" />

            </group>

        </group>

    </group>

    <group

        android:name="second_hand"

        android:translateX="12"

        android:translateY="12" >

        android:name="minute_hand"

        android:translateX="114.25"

        android:translateY="124"

        android:scaleX="0.91922"

        android:scaleY="3.67245"

        android:rotation="121" >

        <group

            android:name="second_hand_pivot"

            android:translateX="-12"

            android:translateY="-12" >

            android:name="minute_hand_pivot"

            android:translateY="-7.69241" >

            <group

                android:name="minute_hand_0"

                android:translateX="-0.25"

                android:translateY="-0.125" >

                <path

                android:name="second_hand_path"

                android:pathData="M 12.7418060303,12.9839935303 c 0.0,0.0 -1.48399353027,0.0 -1.48399353027,0.0 c 0.0,0.0 0.0,-5.98399353027 0.0,-5.98399353027 c 0.0,0 1.48399353027,0 1.48399353027,0 c 0.0,0 0.0,5.98399353027 0.0,5.98399353027 Z"

                    android:name="minute_hand_path"

                    android:fillColor="#FFFFFFFF"

                android:fillAlpha="1" />

                    android:pathData="M -7.986815,-7.986815 l 15.97363,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,15.97363 c 0.0,0.0 0.0,0.0 0.0,0.0 l -15.97363,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-15.97363 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" />

            </group>

        </group>

    </group>

</vector>

res/animator/ic_clock_animation_second_hand.xml→res/interpolator/ic_time_animation_interpolator_0.xml

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

<!--

     Copyright (C) 2014 The Android Open Source Project

     Copyright (C) 2015 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.
@@ -15,11 +15,6 @@ 
     limitations under the License.

-->



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

    <objectAnimator

        android:duration="1333"

        android:propertyName="rotation"

        android:valueFrom="0"

        android:valueTo="360"

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

</set>
 
<pathInterpolator

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

    android:pathData="M 0.0,0.0 c 0.0,0.0 0.618865688196,1.0 1.0,1.0" />