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

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

Merge "Fix radio button tints" into lmp-dev

parents f0452adb c734dafb

core/res/res/drawable/btn_radio_material_anim.xml

+30 −20
Original line number Diff line number Diff line
@@ -16,42 +16,52 @@ 


<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_enabled="false" android:state_checked="true">

        <bitmap android:src="@drawable/btn_radio_to_on_mtrl_015" android:tint="?attr/colorControlActivated" android:alpha="?attr/disabledAlpha" />

        <bitmap

            android:src="@drawable/btn_radio_to_on_mtrl_015"

            android:tint="?attr/colorControlActivated"

            android:alpha="?attr/disabledAlpha" />

    </item>

    <item android:state_enabled="false">

        <bitmap android:src="@drawable/btn_radio_to_on_mtrl_000" android:tint="?attr/colorControlNormal" android:alpha="?attr/disabledAlpha" />

        <bitmap

            android:src="@drawable/btn_radio_to_on_mtrl_000"

            android:tint="?attr/colorControlNormal"

            android:alpha="?attr/disabledAlpha" />

    </item>

    <item android:state_checked="true" android:id="@+id/on">

        <bitmap android:src="@drawable/btn_radio_to_on_mtrl_015" android:tint="?attr/colorControlActivated" />

        <bitmap

            android:src="@drawable/btn_radio_to_on_mtrl_015"

            android:tint="?attr/colorControlActivated" />

    </item>

    <item android:id="@+id/off">

        <bitmap android:src="@drawable/btn_radio_to_on_mtrl_000" android:tint="?attr/colorControlNormal" />

        <bitmap

            android:src="@drawable/btn_radio_to_on_mtrl_000"

            android:tint="?attr/colorControlNormal" />

    </item>

    <transition android:fromId="@+id/off" android:toId="@+id/on">

        <animation-list>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_radio_to_on_mtrl_000" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_radio_to_on_mtrl_000" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_radio_to_on_mtrl_001" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_radio_to_on_mtrl_001" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_radio_to_on_mtrl_002" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_radio_to_on_mtrl_002" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_radio_to_on_mtrl_003" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_radio_to_on_mtrl_003" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_radio_to_on_mtrl_004" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_radio_to_on_mtrl_004" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_radio_to_on_mtrl_005" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_radio_to_on_mtrl_005" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_radio_to_on_mtrl_006" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_radio_to_on_mtrl_006" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_radio_to_on_mtrl_007" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_radio_to_on_mtrl_007" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_radio_to_on_mtrl_008" android:tint="?attr/colorControlActivated" />
@@ -106,28 +116,28 @@ 
                <bitmap android:src="@drawable/btn_radio_to_off_mtrl_007" android:tint="?attr/colorControlActivated" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_radio_to_off_mtrl_008" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_radio_to_off_mtrl_008" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_radio_to_off_mtrl_009" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_radio_to_off_mtrl_009" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_radio_to_off_mtrl_010" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_radio_to_off_mtrl_010" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_radio_to_off_mtrl_011" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_radio_to_off_mtrl_011" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_radio_to_off_mtrl_012" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_radio_to_off_mtrl_012" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_radio_to_off_mtrl_013" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_radio_to_off_mtrl_013" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_radio_to_off_mtrl_014" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_radio_to_off_mtrl_014" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_radio_to_off_mtrl_015" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_radio_to_off_mtrl_015" android:tint="?attr/colorControlNormal" />

            </item>

        </animation-list>

    </transition>