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

Commit 3b4a4992 authored by Christian Robertson's avatar Christian Robertson Committed by Android (Google) Code Review
Browse files

Merge "Changed the color of buttonBarButtonStyle in the Material theme" into lmp-dev

parents 28d6247b 73619e32

core/res/res/values/themes_material.xml

+2 −4
Original line number Diff line number Diff line
@@ -333,8 +333,7 @@ please see themes_device_defaults.xml. 
        <item name="dividerVertical">?attr/listDivider</item>

        <item name="dividerHorizontal">?attr/listDivider</item>

        <item name="buttonBarStyle">@style/Widget.Material.ButtonBar</item>

        <item name="buttonBarButtonStyle">@style/Widget.Material.Button.Borderless</item>

        <item name="buttonBarPositiveButtonStyle">@style/Widget.Material.Button.Borderless.Colored</item>

        <item name="buttonBarButtonStyle">@style/Widget.Material.Button.Borderless.Colored</item>

        <item name="segmentedButtonStyle">@style/Widget.Material.SegmentedButton</item>



        <!-- SearchView attributes -->
@@ -680,8 +679,7 @@ please see themes_device_defaults.xml. 
        <item name="dividerVertical">?attr/listDivider</item>

        <item name="dividerHorizontal">?attr/listDivider</item>

        <item name="buttonBarStyle">@style/Widget.Material.Light.ButtonBar</item>

        <item name="buttonBarButtonStyle">@style/Widget.Material.Light.Button.Borderless</item>

        <item name="buttonBarPositiveButtonStyle">@style/Widget.Material.Light.Button.Borderless.Colored</item>

        <item name="buttonBarButtonStyle">@style/Widget.Material.Light.Button.Borderless.Colored</item>

        <item name="segmentedButtonStyle">@style/Widget.Material.Light.SegmentedButton</item>



        <!-- SearchView attributes -->