Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move insets out of edit text background

Browse Source 
BUG: 16405246
Change-Id: I7eb5b4e33071940cd835999325d2265a92db7e33
This commit is contained in:
Alan Viverette
2014-07-21 10:54:55 -07:00
parent e6ab031e3c
commit c6696c11d7
9 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/res/res/drawable-hdpi/textfield_activated_mtrl_alpha.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 190 B

After

Width:  |  Height:  |  Size: 94 B

BIN
core/res/res/drawable-hdpi/textfield_default_mtrl_alpha.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 194 B

After

Width:  |  Height:  |  Size: 99 B

BIN
core/res/res/drawable-mdpi/textfield_activated_mtrl_alpha.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 160 B

After

Width:  |  Height:  |  Size: 88 B

BIN
core/res/res/drawable-mdpi/textfield_default_mtrl_alpha.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 158 B

After

Width:  |  Height:  |  Size: 95 B

BIN
core/res/res/drawable-xhdpi/textfield_activated_mtrl_alpha.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 244 B

After

Width:  |  Height:  |  Size: 100 B

BIN
core/res/res/drawable-xhdpi/textfield_default_mtrl_alpha.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 243 B

After

Width:  |  Height:  |  Size: 103 B

BIN
core/res/res/drawable-xxhdpi/textfield_activated_mtrl_alpha.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 112 B

BIN
core/res/res/drawable-xxhdpi/textfield_default_mtrl_alpha.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 117 B

39
core/res/res/drawable/edit_text_material.xml
View File

@@ -14,20 +14,25 @@
limitations under the License.
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlActivated">
<item>
<selector>
<item android:state_enabled="false">
<nine-patch android:src="@drawable/textfield_default_mtrl_alpha"
android:tint="?attr/colorControlNormal"
android:alpha="?attr/disabledAlpha" />
</item>
<item>
<nine-patch android:src="@drawable/textfield_default_mtrl_alpha"
android:tint="?attr/colorControlNormal" />
</item>
</selector>
</item>
<item android:id="@+id/mask" android:drawable="@drawable/textfield_activated_mtrl_alpha" />
</ripple>
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:insetLeft="@dimen/control_inset_material"
android:insetTop="@dimen/control_inset_material"
android:insetBottom="@dimen/control_inset_material"
android:insetRight="@dimen/control_inset_material">
<ripple android:color="?attr/colorControlActivated">
<item>
<selector>
<item android:state_enabled="false">
<nine-patch android:src="@drawable/textfield_default_mtrl_alpha"
android:tint="?attr/colorControlNormal"
android:alpha="?attr/disabledAlpha" />
</item>
<item>
<nine-patch android:src="@drawable/textfield_default_mtrl_alpha"
android:tint="?attr/colorControlNormal" />
</item>
</selector>
</item>
<item android:id="@+id/mask" android:drawable="@drawable/textfield_activated_mtrl_alpha" />
</ripple>
</inset>