Merge "Fix menu styling" into lmp-dev

This commit is contained in:
Alan Viverette
2014-08-16 01:08:18 +00:00
committed by Android (Google) Code Review
3 changed files with 6 additions and 3 deletions

View File

@@ -42,10 +42,10 @@
<dimen name="text_size_headline_material">24sp</dimen>
<dimen name="text_size_title_material">20sp</dimen>
<dimen name="text_size_subhead_material">16sp</dimen>
<dimen name="text_size_menu_material">16sp</dimen>
<dimen name="text_size_body_2_material">14sp</dimen>
<dimen name="text_size_body_1_material">14sp</dimen>
<dimen name="text_size_caption_material">12sp</dimen>
<dimen name="text_size_menu_material">14sp</dimen>
<dimen name="text_size_button_material">14sp</dimen>
<dimen name="text_size_large_material">22sp</dimen>

View File

@@ -23,10 +23,10 @@
<string name="font_family_headline_material">sans-serif</string>
<string name="font_family_title_material">sans-serif-medium</string>
<string name="font_family_subhead_material">sans-serif</string>
<string name="font_family_menu_material">sans-serif</string>
<string name="font_family_body_2_material">sans-serif-medium</string>
<string name="font_family_body_1_material">sans-serif</string>
<string name="font_family_caption_material">sans-serif</string>
<string name="font_family_menu_material">sans-serif-medium</string>
<string name="font_family_button_material">sans-serif-medium</string>
</resources>

View File

@@ -632,7 +632,10 @@ please see styles_device_defaults.xml.
<item name="listSelector">?attr/listChoiceBackgroundIndicator</item>
</style>
<style name="Widget.Material.ListView.DropDown"/>
<style name="Widget.Material.ListView.DropDown">
<item name="divider">@null</item>
</style>
<style name="Widget.Material.ListView.White"/>
<style name="Widget.Material.PopupWindow" parent="Widget.PopupWindow"/>