diff options
| author | 2016-09-12 16:59:05 +0000 | |
|---|---|---|
| committer | 2016-09-12 16:59:08 +0000 | |
| commit | b4b51ec3c18ecdd25496ce76005c536223870c2d (patch) | |
| tree | 376fecd614932655328bb74f1ad3018b6b091eee | |
| parent | f3fb0bdeaae7145fcbe886358536984e975438b6 (diff) | |
| parent | 5e1e86c9a1e05fdae11f07ad58deda63609a22e0 (diff) | |
Merge "Remove background for button bar for watch devices." into cw-f-dev
| -rw-r--r-- | core/res/res/values-watch/styles_material.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/styles_material.xml | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/core/res/res/values-watch/styles_material.xml b/core/res/res/values-watch/styles_material.xml index d09119fc7d6b..a5e48451f538 100644 --- a/core/res/res/values-watch/styles_material.xml +++ b/core/res/res/values-watch/styles_material.xml @@ -68,8 +68,6 @@ please see styles_device_defaults.xml. <item name="breakStrategy">balanced</item> </style> - <style name="Widget.Material.ButtonBar" parent="Widget.Material.BaseButtonBar" /> - <style name="TextAppearance.Material.NumberPicker" parent="TextAppearance.Material.Body1"> <item name="textSize">@dimen/text_size_medium_material</item> </style> diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml index 224e3b79d3ed..22bdf7e9616a 100644 --- a/core/res/res/values/styles_material.xml +++ b/core/res/res/values/styles_material.xml @@ -553,11 +553,7 @@ please see styles_device_defaults.xml. <item name="textOff">@string/capital_off</item> </style> - <style name="Widget.Material.BaseButtonBar"> - <item name="background">?attr/colorBackgroundFloating</item> - </style> - - <style name="Widget.Material.ButtonBar" parent="Widget.Material.BaseButtonBar"> + <style name="Widget.Material.ButtonBar"> <item name="background">@null</item> </style> |