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

Commit 614c83d9 authored by Seigo Nonaka's avatar Seigo Nonaka Committed by Android (Google) Code Review
Browse files

Merge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev

parents a63e1325 1265d972

core/res/res/values/styles_holo.xml

+4 −3
Original line number Original line Diff line number Diff line
@@ -1172,7 +1172,8 @@ please see styles_device_defaults.xml. 




    <style name="Widget.Holo.Light.FastScroll" parent="Widget.Holo.FastScroll" />

    <style name="Widget.Holo.Light.FastScroll" parent="Widget.Holo.FastScroll" />





    <style name="Widget.Holo.SuggestionItem" parent="TextAppearance.Holo.Medium">

    <style name="Widget.Holo.SuggestionItem">

        <item name="textAppearance">@android:style/TextAppearance.Holo.Medium</item>

        <item name="background">@color/white</item>

        <item name="background">@color/white</item>

        <item name="drawablePadding">8dip</item>

        <item name="drawablePadding">8dip</item>

        <item name="gravity">start|center_vertical</item>

        <item name="gravity">start|center_vertical</item>
@@ -1188,9 +1189,9 @@ please see styles_device_defaults.xml. 
        <item name="textColor">@color/black</item>

        <item name="textColor">@color/black</item>

    </style>

    </style>





    <style name="TextAppearance.Holo.SuggestionHighlight" parent="TextAppearance.SuggestionHighlight" />

    <style name="TextAppearance.Holo.SuggestionHighlight" parent="@android:style/TextAppearance.SuggestionHighlight" />





    <style name="Widget.Holo.SuggestionButton" parent="Widget.Holo.SuggestionItem">

    <style name="Widget.Holo.SuggestionButton" parent="@android:style/Widget.Holo.SuggestionItem">

        <item name="background">#E9E9E9</item>

        <item name="background">#E9E9E9</item>

        <item name="textColor">@color/black</item>

        <item name="textColor">@color/black</item>

    </style>

    </style>

core/res/res/values/styles_material.xml

+5 −3
Original line number Original line Diff line number Diff line
@@ -1001,7 +1001,8 @@ please see styles_device_defaults.xml. 
        <item name="contentDescription">@string/media_route_button_content_description</item>

        <item name="contentDescription">@string/media_route_button_content_description</item>

    </style>

    </style>





    <style name="Widget.Material.SuggestionItem" parent="@android:style/TextAppearance.Material.Body1">

    <style name="Widget.Material.SuggestionItem">

        <item name="textAppearance">@android:style/TextAppearance.Material.Body1</item>

        <item name="textColor">?attr/textColorSecondary</item>

        <item name="textColor">?attr/textColorSecondary</item>

        <item name="drawablePadding">8dip</item>

        <item name="drawablePadding">8dip</item>

        <item name="gravity">start|center_vertical</item>

        <item name="gravity">start|center_vertical</item>
@@ -1016,11 +1017,12 @@ please see styles_device_defaults.xml. 
        <item name="textSize">14sp</item>

        <item name="textSize">14sp</item>

    </style>

    </style>





    <style name="TextAppearance.Material.TextSuggestionHighlight" parent="Widget.Material.SuggestionItem">

    <style name="TextAppearance.Material.TextSuggestionHighlight">

        <item name="textColor">?attr/textColorPrimary</item>

        <item name="textColor">?attr/textColorPrimary</item>

    </style>

    </style>





    <style name="Widget.Material.SuggestionButton" parent="@android:style/TextAppearance.Material.Button">

    <style name="Widget.Material.SuggestionButton">

        <item name="textAppearance">@android:style/TextAppearance.Material.Button</item>

        <item name="textColor">?attr/colorAccent</item>

        <item name="textColor">?attr/colorAccent</item>

        <item name="drawablePadding">8dip</item>

        <item name="drawablePadding">8dip</item>

        <item name="gravity">start|center_vertical</item>

        <item name="gravity">start|center_vertical</item>