diff options
| author | Alan Viverette <alanv@google.com> | 2014-11-20 21:08:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-20 21:08:32 +0000 |
| commit | 499ea6b6d67609624d85d8ffe2df2f5d435ab895 (patch) | |
| tree | 88ffadc11c367dcc914945cf575816cf59d14aff /core/res | |
| parent | e013f5eace84c3847a89fbbb1869a9d0d54b6f7e (diff) | |
| parent | 21aaf98f6fc666dcd2dad43c368038d441fefbb2 (diff) | |
| download | frameworks_base-499ea6b6d67609624d85d8ffe2df2f5d435ab895.zip frameworks_base-499ea6b6d67609624d85d8ffe2df2f5d435ab895.tar.gz frameworks_base-499ea6b6d67609624d85d8ffe2df2f5d435ab895.tar.bz2 | |
am d8dd5100: Merge "Fix several small layout and color issues" into lmp-mr1-dev
automerge: 21aaf98
* commit '21aaf98f6fc666dcd2dad43c368038d441fefbb2':
Fix several small layout and color issues
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/drawable-hdpi/switch_track_mtrl_alpha.9.png | bin | 468 -> 475 bytes | |||
| -rw-r--r-- | core/res/res/drawable-ldpi/switch_track_mtrl_alpha.9.png | bin | 102 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/drawable/edit_text_material.xml | 32 | ||||
| -rw-r--r-- | core/res/res/values/colors_material.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/dimens_material.xml | 4 |
5 files changed, 22 insertions, 16 deletions
diff --git a/core/res/res/drawable-hdpi/switch_track_mtrl_alpha.9.png b/core/res/res/drawable-hdpi/switch_track_mtrl_alpha.9.png Binary files differindex 0ebe65e..9415bc0 100644 --- a/core/res/res/drawable-hdpi/switch_track_mtrl_alpha.9.png +++ b/core/res/res/drawable-hdpi/switch_track_mtrl_alpha.9.png diff --git a/core/res/res/drawable-ldpi/switch_track_mtrl_alpha.9.png b/core/res/res/drawable-ldpi/switch_track_mtrl_alpha.9.png Binary files differdeleted file mode 100644 index a58128f..0000000 --- a/core/res/res/drawable-ldpi/switch_track_mtrl_alpha.9.png +++ /dev/null diff --git a/core/res/res/drawable/edit_text_material.xml b/core/res/res/drawable/edit_text_material.xml index bbc7301..38ac567 100644 --- a/core/res/res/drawable/edit_text_material.xml +++ b/core/res/res/drawable/edit_text_material.xml @@ -15,21 +15,23 @@ --> <inset xmlns:android="http://schemas.android.com/apk/res/android" - android:inset="@dimen/control_inset_material"> - <ripple android:color="?attr/colorControlActivated"> + android:insetLeft="@dimen/edit_text_inset_horizontal_material" + android:insetRight="@dimen/edit_text_inset_horizontal_material" + android:insetTop="@dimen/edit_text_inset_top_material" + android:insetBottom="@dimen/edit_text_inset_bottom_material"> + <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 android:state_pressed="false" android:state_focused="false"> + <nine-patch android:src="@drawable/textfield_default_mtrl_alpha" + android:tint="?attr/colorControlNormal" /> + </item> <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> + <nine-patch android:src="@drawable/textfield_activated_mtrl_alpha" + android:tint="?attr/colorControlActivated" /> </item> - <item android:id="@+id/mask" android:drawable="@drawable/textfield_activated_mtrl_alpha" /> - </ripple> + </selector> </inset> diff --git a/core/res/res/values/colors_material.xml b/core/res/res/values/colors_material.xml index 46ec838..a8fd8d4 100644 --- a/core/res/res/values/colors_material.xml +++ b/core/res/res/values/colors_material.xml @@ -22,7 +22,7 @@ <color name="background_floating_material_light">#ffeeeeee</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_light">#ff757575</color> diff --git a/core/res/res/values/dimens_material.xml b/core/res/res/values/dimens_material.xml index 4a2119b..e3672c8 100644 --- a/core/res/res/values/dimens_material.xml +++ b/core/res/res/values/dimens_material.xml @@ -91,6 +91,10 @@ <!-- Default rounded corner for controls --> <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_top_material">18dp</dimen> </resources> |
