Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14a0fbf2 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Fix menu styling" into lmp-dev

parents fa492296 b9e1a7c2
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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>
+1 −1
Original line number Diff line number Diff line
@@ -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>
+4 −1
Original line number Diff line number Diff line
@@ -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"/>