Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove background for button bar for watch devices." into cw-f-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-12 16:59:05 +00:00
committed by Android (Google) Code Review
parent f3fb0bdeaa 5e1e86c9a1
commit b4b51ec3c1
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values-watch/styles_material.xml
View File

@@ -68,8 +68,6 @@ please see styles_device_defaults.xml.
<item name="breakStrategy">balanced</item> <item name="breakStrategy">balanced</item>
</style> </style>
<style name="Widget.Material.ButtonBar" parent="Widget.Material.BaseButtonBar" />
<style name="TextAppearance.Material.NumberPicker" parent="TextAppearance.Material.Body1"> <style name="TextAppearance.Material.NumberPicker" parent="TextAppearance.Material.Body1">
<item name="textSize">@dimen/text_size_medium_material</item> <item name="textSize">@dimen/text_size_medium_material</item>
</style> </style>

6
core/res/res/values/styles_material.xml
View File

@@ -553,11 +553,7 @@ please see styles_device_defaults.xml.
<item name="textOff">@string/capital_off</item> <item name="textOff">@string/capital_off</item>
</style> </style>
<style name="Widget.Material.BaseButtonBar"> <style name="Widget.Material.ButtonBar">
<item name="background">?attr/colorBackgroundFloating</item>
</style>
<style name="Widget.Material.ButtonBar" parent="Widget.Material.BaseButtonBar">
<item name="background">@null</item> <item name="background">@null</item>
</style> </style>