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

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

Merge "Update material switch styling" into lmp-dev

parents 5c270bf4 125bab40

core/res/res/color/switch_thumb_material_dark.xml

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

<!-- Copyright (C) 2014 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.

-->



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

    <item android:state_enabled="false" android:color="@color/switch_thumb_disabled_material_dark"/>

    <item android:color="@color/switch_thumb_normal_material_dark"/>

</selector>

core/res/res/color/switch_thumb_material_light.xml

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

<!-- Copyright (C) 2014 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.

-->



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

    <item android:state_enabled="false" android:color="@color/switch_thumb_disabled_material_light"/>

    <item android:color="@color/switch_thumb_normal_material_light"/>

</selector>

core/res/res/drawable/switch_thumb_material_anim.xml

+15 −25
Original line number Diff line number Diff line
@@ -16,22 +16,12 @@ 


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

    android:constantSize="true">

    <item

        android:state_enabled="false"

        android:state_checked="true">

        <nine-patch

            android:src="@drawable/btn_switch_to_on_mtrl_00012"

            android:gravity="center"

            android:tintMode="multiply"

            android:tint="?attr/colorControlActivated"

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

    </item>

    <item android:state_enabled="false">

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

        <nine-patch

            android:src="@drawable/btn_switch_to_on_mtrl_00001"

            android:gravity="center"

            android:tintMode="multiply"

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

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

    </item>

    <item

        android:state_checked="true"
@@ -47,29 +37,29 @@ 
            android:src="@drawable/btn_switch_to_on_mtrl_00001"

            android:gravity="center"

            android:tintMode="multiply"

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

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

    </item>

    <transition

        android:fromId="@+id/off"

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

        <animation-list>

            <item android:duration="15">

                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00001" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />

                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00001" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorSwitchThumbNormal" />

            </item>

            <item android:duration="15">

                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00002" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />

                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00002" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorSwitchThumbNormal" />

            </item>

            <item android:duration="15">

                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00003" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />

                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00003" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorSwitchThumbNormal" />

            </item>

            <item android:duration="15">

                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00004" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />

                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00004" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorSwitchThumbNormal" />

            </item>

            <item android:duration="15">

                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00005" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />

                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00005" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorSwitchThumbNormal" />

            </item>

            <item android:duration="15">

                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00006" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />

                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00006" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorSwitchThumbNormal" />

            </item>

            <item android:duration="15">

                <nine-patch android:src="@drawable/btn_switch_to_on_mtrl_00007" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" />
@@ -112,22 +102,22 @@ 
                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00006" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorControlActivated" />

            </item>

            <item android:duration="15">

                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00007" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />

                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00007" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorSwitchThumbNormal" />

            </item>

            <item android:duration="15">

                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00008" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />

                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00008" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorSwitchThumbNormal" />

            </item>

            <item android:duration="15">

                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00009" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />

                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00009" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorSwitchThumbNormal" />

            </item>

            <item android:duration="15">

                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00010" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />

                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00010" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorSwitchThumbNormal" />

            </item>

            <item android:duration="15">

                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00011" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />

                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00011" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorSwitchThumbNormal" />

            </item>

            <item android:duration="15">

                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00012" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorButtonNormal" />

                <nine-patch android:src="@drawable/btn_switch_to_off_mtrl_00012" android:gravity="center" android:tintMode="multiply" android:tint="?attr/colorSwitchThumbNormal" />

            </item>

        </animation-list>

    </transition>

core/res/res/drawable/switch_track_material.xml

+4 −4
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
-->



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

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

    <item android:state_enabled="false">

        <nine-patch android:src="@drawable/switch_track_mtrl_alpha"

            android:tint="?attr/colorControlActivated"

            android:alpha="0.2" />

            android:tint="?attr/colorForeground"

            android:alpha="0.1" />

    </item>

    <item android:state_checked="true">

        <nine-patch android:src="@drawable/switch_track_mtrl_alpha"
@@ -27,7 +27,7 @@ 
    </item>

    <item>

        <nine-patch android:src="@drawable/switch_track_mtrl_alpha"

            android:tint="?attr/colorButtonNormal"

            android:tint="?attr/colorForeground"

            android:alpha="0.3" />

    </item>

</selector>

core/res/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -1005,6 +1005,9 @@ 
        <!-- The color applied to framework buttons in their normal state. -->

        <attr name="colorButtonNormal" format="color" />



        <!-- The color applied to framework switch thumbs in their normal state. -->

        <attr name="colorSwitchThumbNormal" format="color" />



        <!-- ================== -->

        <!-- Hardware rendering -->

        <!-- ================== -->