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

am d8dd5100: Merge "Fix several small layout and color issues" into lmp-mr1-dev

Browse Source 
automerge: 21aaf98

* commit '21aaf98f6fc666dcd2dad43c368038d441fefbb2':
  Fix several small layout and color issues
This commit is contained in:
Alan Viverette
2014-11-20 21:08:32 +00:00
committed by android-build-merger
parent e013f5eace 21aaf98f6f
commit 499ea6b6d6
5 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 475 B

BIN
core/res/res/drawable-ldpi/switch_track_mtrl_alpha.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 102 B

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

@@ -15,21 +15,23 @@
--> -->
<inset xmlns:android="http://schemas.android.com/apk/res/android" <inset xmlns:android="http://schemas.android.com/apk/res/android"
android:inset="@dimen/control_inset_material"> android:insetLeft="@dimen/edit_text_inset_horizontal_material"
<ripple android:color="?attr/colorControlActivated"> android:insetRight="@dimen/edit_text_inset_horizontal_material"
<item> android:insetTop="@dimen/edit_text_inset_top_material"
<selector> android:insetBottom="@dimen/edit_text_inset_bottom_material">
<item android:state_enabled="false"> <selector>
<nine-patch android:src="@drawable/textfield_default_mtrl_alpha" <item android:state_enabled="false">
android:tint="?attr/colorControlNormal" <nine-patch android:src="@drawable/textfield_default_mtrl_alpha"
android:alpha="?attr/disabledAlpha" /> android:tint="?attr/colorControlNormal"
</item> android:alpha="?attr/disabledAlpha" />
<item>
<nine-patch android:src="@drawable/textfield_default_mtrl_alpha"
android:tint="?attr/colorControlNormal" />
</item>
</selector>
</item> </item>
<item android:id="@+id/mask" android:drawable="@drawable/textfield_activated_mtrl_alpha" /> <item android:state_pressed="false" android:state_focused="false">
</ripple> <nine-patch android:src="@drawable/textfield_default_mtrl_alpha"
android:tint="?attr/colorControlNormal" />
</item>
<item>
<nine-patch android:src="@drawable/textfield_activated_mtrl_alpha"
android:tint="?attr/colorControlActivated" />
</item>
</selector>
</inset> </inset>

2
core/res/res/values/colors_material.xml
View File

@@ -22,7 +22,7 @@
<color name="background_floating_material_light">#ffeeeeee</color> <color name="background_floating_material_light">#ffeeeeee</color>
<color name="primary_material_dark">#ff212121</color> <color name="primary_material_dark">#ff212121</color>
<color name="primary_material_light">#ffe0e0e0</color> <color name="primary_material_light">#ffefefef</color>
<color name="primary_dark_material_dark">#ff000000</color> <color name="primary_dark_material_dark">#ff000000</color>
<color name="primary_dark_material_light">#ff757575</color> <color name="primary_dark_material_light">#ff757575</color>

4
core/res/res/values/dimens_material.xml
View File

@@ -91,6 +91,10 @@
<!-- Default rounded corner for controls --> <!-- Default rounded corner for controls -->
<dimen name="control_corner_material">2dp</dimen> <dimen name="control_corner_material">2dp</dimen>
<dimen name="edit_text_inset_horizontal_material">4dp</dimen>
<dimen name="edit_text_inset_top_material">4dp</dimen>
<dimen name="edit_text_inset_bottom_material">8dp</dimen>
<dimen name="dialog_padding_material">24dp</dimen> <dimen name="dialog_padding_material">24dp</dimen>
<dimen name="dialog_padding_top_material">18dp</dimen> <dimen name="dialog_padding_top_material">18dp</dimen>
</resources> </resources>