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

Commit e74b853d authored by Adrian Roos's avatar Adrian Roos
Browse files

resolved conflict for merge of 3ca33b70 to master 

Change-Id: I5226015ca7cef030586349cc698a46e458ac788e
parents e6cad802 eb29d330

api/current.txt

+269 −265

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/drawable/btn_borderless_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->



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

    android:tint="?attr/colorControlHighlight">

    android:color="?attr/colorControlHighlight">

    <item android:id="@id/mask"

        android:drawable="@drawable/btn_mtrl_alpha" />

</ripple>

core/res/res/drawable/btn_default_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->



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

    android:tint="?attr/colorControlHighlight">

    android:color="?attr/colorControlHighlight">

    <item>

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

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

core/res/res/drawable/btn_toggle_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    android:insetRight="4dp">

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

        <item>

            <ripple android:tint="?attr/colorControlHighlight">

            <ripple android:color="?attr/colorControlHighlight">

                <item>

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

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

core/res/res/drawable/edit_text_material.xml

+1 −2
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ 
-->



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

    android:tint="?attr/colorControlActivated"

    android:tintMode="src_over">

    android:color="?attr/colorControlActivated">

    <item>

        <selector>

            <item android:state_enabled="false">