Merge "Fix borderless colored button text color" into nyc-dev

am: 8f0ab27570

* commit '8f0ab27570ef48b234c9454804b42cf28e0a7313':
  Fix borderless colored button text color

Change-Id: Ida0d73d23ded8f8a51818791ce1de14307e5bfcf
This commit is contained in:
Alan Viverette
2016-05-26 00:53:49 +00:00
committed by android-build-merger

View File

@@ -303,7 +303,7 @@ please see styles_device_defaults.xml.
</style>
<style name="TextAppearance.Material.Widget.Button.Borderless.Colored" parent="TextAppearance.Material.Widget.Button">
<item name="textColor">@color/btn_colored_text_material</item>
<item name="textColor">@color/btn_colored_borderless_text_material</item>
</style>
<style name="TextAppearance.Material.Widget.EditText">