summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-02-12 00:10:33 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-02-12 00:10:33 +0000
commit5ca454024fc7c9b18565c4127c03bed38bb95c6d (patch)
tree6e4811a51d2a3d32f2f40e3553ce57b3fcaf746c
parent6f6b877a9e1f1acbbd28ec58ae7fd9471185adde (diff)
parent94e8259d308eb70557ec99553b7d0e99961e06c2 (diff)
Merge "Remove fontFamily in Widget.DeviceDefault.TextView"
-rw-r--r--core/res/res/values/styles_device_defaults.xml4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/res/res/values/styles_device_defaults.xml b/core/res/res/values/styles_device_defaults.xml
index 0dc54e091f9d..93068ea975bd 100644
--- a/core/res/res/values/styles_device_defaults.xml
+++ b/core/res/res/values/styles_device_defaults.xml
@@ -41,9 +41,7 @@ easier.
<item name="textAppearance">?attr/textAppearanceButton</item>
<item name="textColor">@color/btn_colored_text_material</item>
</style>
- <style name="Widget.DeviceDefault.TextView" parent="Widget.Material.TextView">
- <item name="fontFamily">@string/config_bodyFontFamily</item>
- </style>
+ <style name="Widget.DeviceDefault.TextView" parent="Widget.Material.TextView" />
<style name="Widget.DeviceDefault.CheckedTextView" parent="Widget.Material.CheckedTextView"/>
<style name="Widget.DeviceDefault.AutoCompleteTextView" parent="Widget.Material.AutoCompleteTextView"/>
<style name="Widget.DeviceDefault.CompoundButton.CheckBox" parent="Widget.Material.CompoundButton.CheckBox"/>