Merge "Adjust edit text layout, ripple alphas to be closer to Material spec" into lmp-mr1-dev

2014-12-08 17:57:15 +00:00
parent 2ea3650d18 d52381883d
commit 3ad4153710
40 changed files with 4 additions and 4 deletions
--- a/core/res/res/drawable-hdpi/textfield_activated_mtrl_alpha.9.png
+++ b/core/res/res/drawable-hdpi/textfield_activated_mtrl_alpha.9.png
--- a/core/res/res/drawable-hdpi/textfield_default_mtrl_alpha.9.png
+++ b/core/res/res/drawable-hdpi/textfield_default_mtrl_alpha.9.png
--- a/core/res/res/drawable-ldpi/ab_solid_shadow_mtrl.9.png
+++ b/core/res/res/drawable-ldpi/ab_solid_shadow_mtrl.9.png
--- a/core/res/res/drawable-ldpi/ab_transparent_mtrl_alpha.9.png
+++ b/core/res/res/drawable-ldpi/ab_transparent_mtrl_alpha.9.png
--- a/core/res/res/drawable-ldpi/btn_check_off_mtrl_alpha.png
+++ b/core/res/res/drawable-ldpi/btn_check_off_mtrl_alpha.png
--- a/core/res/res/drawable-ldpi/btn_check_on_mtrl_alpha.png
+++ b/core/res/res/drawable-ldpi/btn_check_on_mtrl_alpha.png
--- a/core/res/res/drawable-ldpi/btn_radio_off_mtrl_alpha.png
+++ b/core/res/res/drawable-ldpi/btn_radio_off_mtrl_alpha.png
--- a/core/res/res/drawable-ldpi/btn_radio_off_pressed_mtrl_alpha.png
+++ b/core/res/res/drawable-ldpi/btn_radio_off_pressed_mtrl_alpha.png
--- a/core/res/res/drawable-ldpi/btn_radio_on_mtrl_alpha.png
+++ b/core/res/res/drawable-ldpi/btn_radio_on_mtrl_alpha.png
--- a/core/res/res/drawable-ldpi/btn_radio_on_pressed_mtrl_alpha.png
+++ b/core/res/res/drawable-ldpi/btn_radio_on_pressed_mtrl_alpha.png
--- a/core/res/res/drawable-ldpi/btn_star_mtrl_alpha.png
+++ b/core/res/res/drawable-ldpi/btn_star_mtrl_alpha.png
--- a/core/res/res/drawable-ldpi/expander_close_mtrl_alpha.9.png
+++ b/core/res/res/drawable-ldpi/expander_close_mtrl_alpha.9.png
--- a/core/res/res/drawable-ldpi/expander_open_mtrl_alpha.9.png
+++ b/core/res/res/drawable-ldpi/expander_open_mtrl_alpha.9.png
--- a/core/res/res/drawable-ldpi/ic_cab_done_mtrl_alpha.png
+++ b/core/res/res/drawable-ldpi/ic_cab_done_mtrl_alpha.png
--- a/core/res/res/drawable-ldpi/ic_find_next_mtrl_alpha.png
+++ b/core/res/res/drawable-ldpi/ic_find_next_mtrl_alpha.png
--- a/core/res/res/drawable-ldpi/ic_find_previous_mtrl_alpha.png
+++ b/core/res/res/drawable-ldpi/ic_find_previous_mtrl_alpha.png
--- a/core/res/res/drawable-ldpi/ic_menu_find_mtrl_alpha.png
+++ b/core/res/res/drawable-ldpi/ic_menu_find_mtrl_alpha.png
--- a/core/res/res/drawable-ldpi/ic_menu_search_mtrl_alpha.png
+++ b/core/res/res/drawable-ldpi/ic_menu_search_mtrl_alpha.png
--- a/core/res/res/drawable-ldpi/list_divider_mtrl_alpha.9.png
+++ b/core/res/res/drawable-ldpi/list_divider_mtrl_alpha.9.png
--- a/core/res/res/drawable-ldpi/list_section_divider_mtrl_alpha.9.png
+++ b/core/res/res/drawable-ldpi/list_section_divider_mtrl_alpha.9.png
--- a/core/res/res/drawable-ldpi/progress_mtrl_alpha.9.png
+++ b/core/res/res/drawable-ldpi/progress_mtrl_alpha.9.png
--- a/core/res/res/drawable-ldpi/scrubber_control_off_mtrl_alpha.png
+++ b/core/res/res/drawable-ldpi/scrubber_control_off_mtrl_alpha.png
--- a/core/res/res/drawable-ldpi/scrubber_control_off_pressed_mtrl_alpha.png
+++ b/core/res/res/drawable-ldpi/scrubber_control_off_pressed_mtrl_alpha.png
--- a/core/res/res/drawable-ldpi/scrubber_control_on_mtrl_alpha.png
+++ b/core/res/res/drawable-ldpi/scrubber_control_on_mtrl_alpha.png
--- a/core/res/res/drawable-ldpi/scrubber_control_on_pressed_mtrl_alpha.png
+++ b/core/res/res/drawable-ldpi/scrubber_control_on_pressed_mtrl_alpha.png
--- a/core/res/res/drawable-ldpi/scrubber_primary_mtrl_alpha.9.png
+++ b/core/res/res/drawable-ldpi/scrubber_primary_mtrl_alpha.9.png
--- a/core/res/res/drawable-ldpi/spinner_mtrl_am_alpha.9.png
+++ b/core/res/res/drawable-ldpi/spinner_mtrl_am_alpha.9.png
--- a/core/res/res/drawable-ldpi/switch_off_mtrl_alpha.9.png
+++ b/core/res/res/drawable-ldpi/switch_off_mtrl_alpha.9.png
--- a/core/res/res/drawable-ldpi/switch_on_mtrl_alpha.9.png
+++ b/core/res/res/drawable-ldpi/switch_on_mtrl_alpha.9.png
--- a/core/res/res/drawable-ldpi/text_cursor_mtrl_alpha.9.png
+++ b/core/res/res/drawable-ldpi/text_cursor_mtrl_alpha.9.png
--- a/core/res/res/drawable-ldpi/textfield_activated_mtrl_alpha.9.png
+++ b/core/res/res/drawable-ldpi/textfield_activated_mtrl_alpha.9.png
--- a/core/res/res/drawable-ldpi/textfield_default_mtrl_alpha.9.png
+++ b/core/res/res/drawable-ldpi/textfield_default_mtrl_alpha.9.png
--- a/core/res/res/drawable-mdpi/textfield_activated_mtrl_alpha.9.png
+++ b/core/res/res/drawable-mdpi/textfield_activated_mtrl_alpha.9.png
--- a/core/res/res/drawable-mdpi/textfield_default_mtrl_alpha.9.png
+++ b/core/res/res/drawable-mdpi/textfield_default_mtrl_alpha.9.png
--- a/core/res/res/drawable-xhdpi/textfield_activated_mtrl_alpha.9.png
+++ b/core/res/res/drawable-xhdpi/textfield_activated_mtrl_alpha.9.png
--- a/core/res/res/drawable-xhdpi/textfield_default_mtrl_alpha.9.png
+++ b/core/res/res/drawable-xhdpi/textfield_default_mtrl_alpha.9.png
--- a/core/res/res/drawable-xxhdpi/textfield_activated_mtrl_alpha.9.png
+++ b/core/res/res/drawable-xxhdpi/textfield_activated_mtrl_alpha.9.png
--- a/core/res/res/drawable-xxhdpi/textfield_default_mtrl_alpha.9.png
+++ b/core/res/res/drawable-xxhdpi/textfield_default_mtrl_alpha.9.png
--- a/core/res/res/values/colors_material.xml
+++ b/core/res/res/values/colors_material.xml
@@ -26,8 +26,8 @@
    <color name="primary_dark_material_dark">#ff000000</color>
    <color name="primary_dark_material_light">#ff757575</color>

-    <color name="ripple_material_dark">#40ffffff</color>
-    <color name="ripple_material_light">#40000000</color>
+    <color name="ripple_material_dark">#4dffffff</color>
+    <color name="ripple_material_light">#1f000000</color>

    <color name="accent_material_light">@color/material_deep_teal_500</color>
    <color name="accent_material_dark">@color/material_deep_teal_200</color>
--- a/core/res/res/values/dimens_material.xml
+++ b/core/res/res/values/dimens_material.xml
@@ -105,8 +105,8 @@
    <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="edit_text_inset_top_material">10dp</dimen>
+    <dimen name="edit_text_inset_bottom_material">7dp</dimen>

    <dimen name="dialog_padding_material">24dp</dimen>
    <dimen name="dialog_padding_top_material">18dp</dimen>