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

Commit 9c8b5252 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Update radio buttons to use AVD"

parents 9fb0b5b1 d58ad5b3

core/res/res/anim/ic_checkbox_to_checked_box_inner_merged_animation.xml→core/res/res/anim/btn_checkbox_to_checked_box_inner_merged_animation.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        android:valueFrom="M -7.0,-7.0 l 14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,14.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-14.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z M 7.0,-9.0 c 0.0,0.0 -14.0,0.0 -14.0,0.0 c -1.1044921875,0.0 -2.0,0.8955078125 -2.0,2.0 c 0.0,0.0 0.0,14.0 0.0,14.0 c 0.0,1.1044921875 0.8955078125,2.0 2.0,2.0 c 0.0,0.0 14.0,0.0 14.0,0.0 c 1.1044921875,0.0 2.0,-0.8955078125 2.0,-2.0 c 0.0,0.0 0.0,-14.0 0.0,-14.0 c 0.0,-1.1044921875 -0.8955078125,-2.0 -2.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"

        android:valueTo="M 0.0,-0.05 l 0.0,0.0 c 0.02761423749,0.0 0.05,0.02238576251 0.05,0.05 l 0.0,0.0 c 0.0,0.02761423749 -0.02238576251,0.05 -0.05,0.05 l 0.0,0.0 c -0.02761423749,0.0 -0.05,-0.02238576251 -0.05,-0.05 l 0.0,0.0 c 0.0,-0.02761423749 0.02238576251,-0.05 0.05,-0.05 Z M 7.0,-9.0 c 0.0,0.0 -14.0,0.0 -14.0,0.0 c -1.1044921875,0.0 -2.0,0.8955078125 -2.0,2.0 c 0.0,0.0 0.0,14.0 0.0,14.0 c 0.0,1.1044921875 0.8955078125,2.0 2.0,2.0 c 0.0,0.0 14.0,0.0 14.0,0.0 c 1.1044921875,0.0 2.0,-0.8955078125 2.0,-2.0 c 0.0,0.0 0.0,-14.0 0.0,-14.0 c 0.0,-1.1044921875 -0.8955078125,-2.0 -2.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"

        android:valueType="pathType"

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

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

    <set android:ordering="sequentially">

        <objectAnimator

            android:duration="166"
@@ -34,6 +34,6 @@ 
            android:propertyName="fillAlpha"

            android:valueFrom="1.0"

            android:valueTo="0.0"

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

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

    </set>

</set>

core/res/res/anim/ic_checkbox_to_checked_box_outer_merged_animation.xml→core/res/res/anim/btn_checkbox_to_checked_box_outer_merged_animation.xml

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
            android:valueFrom="M 7.0,-9.0 c 0.0,0.0 -14.0,0.0 -14.0,0.0 c -1.1044921875,0.0 -2.0,0.8955078125 -2.0,2.0 c 0.0,0.0 0.0,14.0 0.0,14.0 c 0.0,1.1044921875 0.8955078125,2.0 2.0,2.0 c 0.0,0.0 14.0,0.0 14.0,0.0 c 1.1044921875,0.0 2.0,-0.8955078125 2.0,-2.0 c 0.0,0.0 0.0,-14.0 0.0,-14.0 c 0.0,-1.1044921875 -0.8955078125,-2.0 -2.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z M -2.0,5.00001525879 c 0.0,0.0 -1.4234161377,-1.40159606934 -1.4234161377,-1.40159606934 c 0.0,0.0 1.41409301758,-1.41409301758 1.41409301758,-1.41409301758 c 0.0,0.0 0.00932312011719,-0.0124053955078 0.00932312011719,-0.0124053955078 c 0.0,0.0 0.0234069824219,-0.0235137939453 0.0234069824219,-0.0235137939453 c 0.0,0.0 1.41409301758,1.41409301758 1.41409301758,1.41409301758 c 0.0,0.0 -1.4375,1.43751525879 -1.4375,1.43751525879 Z"

            android:valueTo="M 7.0,-9.0 c 0.0,0.0 -14.0,0.0 -14.0,0.0 c -1.1044921875,0.0 -2.0,0.8955078125 -2.0,2.0 c 0.0,0.0 0.0,14.0 0.0,14.0 c 0.0,1.1044921875 0.8955078125,2.0 2.0,2.0 c 0.0,0.0 14.0,0.0 14.0,0.0 c 1.1044921875,0.0 2.0,-0.8955078125 2.0,-2.0 c 0.0,0.0 0.0,-14.0 0.0,-14.0 c 0.0,-1.1044921875 -0.8955078125,-2.0 -2.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z M -2.0,5.00001525879 c 0.0,0.0 -5.0,-5.00001525879 -5.0,-5.00001525879 c 0.0,0.0 1.41409301758,-1.41409301758 1.41409301758,-1.41409301758 c 0.0,0.0 3.58590698242,3.58601379395 3.58590698242,3.58601379395 c 0.0,0.0 7.58590698242,-7.58601379395 7.58590698242,-7.58601379395 c 0.0,0.0 1.41409301758,1.41409301758 1.41409301758,1.41409301758 c 0.0,0.0 -9.0,9.00001525879 -9.0,9.00001525879 Z"

            android:valueType="pathType"

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

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

    </set>

    <set android:ordering="sequentially">

        <objectAnimator
@@ -43,6 +43,6 @@ 
            android:propertyName="fillAlpha"

            android:valueFrom="0.0"

            android:valueTo="1.0"

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

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

    </set>

</set>

core/res/res/anim/ic_checkbox_to_checked_icon_null_animation.xml→core/res/res/anim/btn_checkbox_to_checked_icon_null_animation.xml

+4 −4
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ 
            android:propertyName="scaleX"

            android:valueFrom="0.2"

            android:valueTo="0.18"

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

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

        <objectAnimator

            android:duration="300"

            android:propertyName="scaleX"

            android:valueFrom="0.18"

            android:valueTo="0.2"

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

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

    </set>

    <set android:ordering="sequentially">

        <objectAnimator
@@ -35,12 +35,12 @@ 
            android:propertyName="scaleY"

            android:valueFrom="0.2"

            android:valueTo="0.18"

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

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

        <objectAnimator

            android:duration="300"

            android:propertyName="scaleY"

            android:valueFrom="0.18"

            android:valueTo="0.2"

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

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

    </set>

</set>

core/res/res/anim/ic_checkbox_to_unchecked_box_inner_merged_animation.xml→core/res/res/anim/btn_checkbox_to_unchecked_box_inner_merged_animation.xml

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
            android:valueFrom="M 0.0,-1.0 l 0.0,0.0 c 0.5522847498,0.0 1.0,0.4477152502 1.0,1.0 l 0.0,0.0 c 0.0,0.5522847498 -0.4477152502,1.0 -1.0,1.0 l 0.0,0.0 c -0.5522847498,0.0 -1.0,-0.4477152502 -1.0,-1.0 l 0.0,0.0 c 0.0,-0.5522847498 0.4477152502,-1.0 1.0,-1.0 Z M 7.0,-9.0 c 0.0,0.0 -14.0,0.0 -14.0,0.0 c -1.1044921875,0.0 -2.0,0.8955078125 -2.0,2.0 c 0.0,0.0 0.0,14.0 0.0,14.0 c 0.0,1.1044921875 0.8955078125,2.0 2.0,2.0 c 0.0,0.0 14.0,0.0 14.0,0.0 c 1.1044921875,0.0 2.0,-0.8955078125 2.0,-2.0 c 0.0,0.0 0.0,-14.0 0.0,-14.0 c 0.0,-1.1044921875 -0.8955078125,-2.0 -2.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"

            android:valueTo="M -7.0,-7.0 l 14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,14.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -14.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-14.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z M 7.0,-9.0 c 0.0,0.0 -14.0,0.0 -14.0,0.0 c -1.1044921875,0.0 -2.0,0.8955078125 -2.0,2.0 c 0.0,0.0 0.0,14.0 0.0,14.0 c 0.0,1.1044921875 0.8955078125,2.0 2.0,2.0 c 0.0,0.0 14.0,0.0 14.0,0.0 c 1.1044921875,0.0 2.0,-0.8955078125 2.0,-2.0 c 0.0,0.0 0.0,-14.0 0.0,-14.0 c 0.0,-1.1044921875 -0.8955078125,-2.0 -2.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"

            android:valueType="pathType"

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

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

    </set>

    <set android:ordering="sequentially">

        <objectAnimator
@@ -43,6 +43,6 @@ 
            android:propertyName="fillAlpha"

            android:valueFrom="0.0"

            android:valueTo="1.0"

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

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

    </set>

</set>

core/res/res/anim/ic_checkbox_to_unchecked_check_path_merged_animation.xml→core/res/res/anim/btn_checkbox_to_unchecked_check_path_merged_animation.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        android:valueFrom="M 7.0,-9.0 c 0.0,0.0 -14.0,0.0 -14.0,0.0 c -1.1044921875,0.0 -2.0,0.8955078125 -2.0,2.0 c 0.0,0.0 0.0,14.0 0.0,14.0 c 0.0,1.1044921875 0.8955078125,2.0 2.0,2.0 c 0.0,0.0 14.0,0.0 14.0,0.0 c 1.1044921875,0.0 2.0,-0.8955078125 2.0,-2.0 c 0.0,0.0 0.0,-14.0 0.0,-14.0 c 0.0,-1.1044921875 -0.8955078125,-2.0 -2.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z M -2.0,5.00001525879 c 0.0,0.0 -5.0,-5.00001525879 -5.0,-5.00001525879 c 0.0,0.0 1.41409301758,-1.41409301758 1.41409301758,-1.41409301758 c 0.0,0.0 3.58590698242,3.58601379395 3.58590698242,3.58601379395 c 0.0,0.0 7.58590698242,-7.58601379395 7.58590698242,-7.58601379395 c 0.0,0.0 1.41409301758,1.41409301758 1.41409301758,1.41409301758 c 0.0,0.0 -9.0,9.00001525879 -9.0,9.00001525879 Z"

        android:valueTo="M 7.0,-9.0 c 0.0,0.0 -14.0,0.0 -14.0,0.0 c -1.1044921875,0.0 -2.0,0.8955078125 -2.0,2.0 c 0.0,0.0 0.0,14.0 0.0,14.0 c 0.0,1.1044921875 0.8955078125,2.0 2.0,2.0 c 0.0,0.0 14.0,0.0 14.0,0.0 c 1.1044921875,0.0 2.0,-0.8955078125 2.0,-2.0 c 0.0,0.0 0.0,-14.0 0.0,-14.0 c 0.0,-1.1044921875 -0.8955078125,-2.0 -2.0,-2.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z M 0.0,1.42500305176 c 0.0,0.0 -1.4234161377,-1.40159606934 -1.4234161377,-1.40159606934 c 0.0,0.0 1.41409301758,-1.41409301758 1.41409301758,-1.41409301758 c 0.0,0.0 0.00932312011719,-0.0124053955078 0.00932312011719,-0.0124053955078 c 0.0,0.0 0.0234069824219,-0.0235137939453 0.0234069824219,-0.0235137939453 c 0.0,0.0 1.41409301758,1.41409301758 1.41409301758,1.41409301758 c 0.0,0.0 -1.4375,1.43751525879 -1.4375,1.43751525879 Z"

        android:valueType="pathType"

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

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

    <set android:ordering="sequentially" >

        <objectAnimator

            android:duration="133"
@@ -34,6 +34,6 @@ 
            android:propertyName="fillAlpha"

            android:valueFrom="1.0"

            android:valueTo="0.0"

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

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

    </set>

</set>