summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Kwan <mkwan@google.com> 2016-09-09 18:37:24 -0700
committer Michael Kwan <mkwan@google.com> 2016-09-09 18:37:24 -0700
commit5e1e86c9a1e05fdae11f07ad58deda63609a22e0 (patch)
tree516161cea58390602f50bf468816744d9ecb5a7d
parent0df86bee98ee96724920de80ab289be53be5caad (diff)
Remove background for button bar for watch devices.
Bug: 31222864 Change-Id: Idbe73478f3cff45ed502853ffa1e426d475dbf3e
-rw-r--r--core/res/res/values-watch/styles_material.xml2
-rw-r--r--core/res/res/values/styles_material.xml6
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>