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

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

Merge "Add focused & disabled states for spinner assets" into lmp-mr1-dev

parents c414f466 07ac7fbc

core/res/res/drawable/spinner_background_material.xml

+6 −5
Original line number Diff line number Diff line
@@ -16,16 +16,17 @@ 


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

    android:autoMirrored="true">

    <item android:state_checked="true">

    <item android:state_enabled="false">

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

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

            android:tint="?attr/colorControlNormal"

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

    </item>

    <item android:state_pressed="true">

    <item android:state_pressed="false" android:state_focused="false">

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

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

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

    </item>

    <item>

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

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

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

    </item>

</selector>

core/res/res/drawable/spinner_textfield_background_material.xml

+15 −1
Original line number Diff line number Diff line
@@ -17,7 +17,21 @@ 
<inset xmlns:android="http://schemas.android.com/apk/res/android"

       android:inset="@dimen/control_inset_material">

    <selector android:autoMirrored="true">

        <item android:state_checked="false" android:state_pressed="false">

        <item android:state_enabled="false">

            <layer-list android:paddingMode="stack">

                <item>

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

                        android:tint="?attr/colorControlActivated"

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

                </item>

                <item>

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

                        android:tint="?attr/colorControlActivated"

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

                </item>

            </layer-list>

        </item>

        <item android:state_pressed="false" android:state_focused="false">

            <layer-list android:paddingMode="stack">

                <item>

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