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

Commit 7d686608 authored by Alan Viverette's avatar Alan Viverette
Browse files

Fix switch animation end state colors 

BUG: 16418389
Change-Id: I678eb25c38a1303141dc89cfe1cccbd1bd8bcdc1
parent b74a7bab

core/res/res/drawable/switch_thumb_material_anim.xml

+44 −23
Original line number Diff line number Diff line
@@ -14,41 +14,62 @@ 
     limitations under the License.

-->



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

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

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

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

    android:constantSize="true">

    <item

        android:state_enabled="false"

        android:state_checked="true">

        <bitmap

            android:src="@drawable/btn_switch_to_on_mtrl_014"

            android:gravity="center"

            android:tint="?attr/colorControlActivated"

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

    </item>

    <item android:state_enabled="false">

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

    </item>

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

        <bitmap android:src="@drawable/btn_switch_to_on_mtrl_014" android:gravity="center" android:tint="?attr/colorControlActivated" />

        <bitmap

            android:src="@drawable/btn_switch_to_on_mtrl_000"

            android:gravity="center"

            android:tint="?attr/colorControlNormal"

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

    </item>

    <item

        android:state_checked="true"

        android:id="@+id/on">

        <bitmap

            android:src="@drawable/btn_switch_to_on_mtrl_014"

            android:gravity="center"

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

    </item>

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

        <bitmap android:src="@drawable/btn_switch_to_on_mtrl_000" android:gravity="center" android:tint="?attr/colorControlNormal" />

    </item>

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

        <bitmap

            android:src="@drawable/btn_switch_to_on_mtrl_000"

            android:gravity="center"

            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_switch_to_on_mtrl_000" android:gravity="center" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_000" android:gravity="center" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_001" android:gravity="center" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_001" android:gravity="center" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_002" android:gravity="center" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_002" android:gravity="center" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_003" android:gravity="center" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_003" android:gravity="center" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_004" android:gravity="center" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_004" android:gravity="center" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_005" android:gravity="center" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_005" android:gravity="center" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_006" android:gravity="center" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_006" android:gravity="center" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_switch_to_on_mtrl_007" android:gravity="center" android:tint="?attr/colorControlActivated" />
@@ -100,28 +121,28 @@ 
                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_006" android:gravity="center" android:tint="?attr/colorControlActivated" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_007" android:gravity="center" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_007" android:gravity="center" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_008" android:gravity="center" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_008" android:gravity="center" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_009" android:gravity="center" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_009" android:gravity="center" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_010" android:gravity="center" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_010" android:gravity="center" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_011" android:gravity="center" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_011" android:gravity="center" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_012" android:gravity="center" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_012" android:gravity="center" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_013" android:gravity="center" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_013" android:gravity="center" android:tint="?attr/colorControlNormal" />

            </item>

            <item android:duration="15">

                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_014" android:gravity="center" android:tint="?attr/colorControlActivated" />

                <bitmap android:src="@drawable/btn_switch_to_off_mtrl_014" android:gravity="center" android:tint="?attr/colorControlNormal" />

            </item>

        </animation-list>

    </transition>