Merge "Fix borderless colored button text color" into nyc-dev am: 8f0ab27570

am: 57b00f7c6a

* commit '57b00f7c6aaaa8f0f4d9ad2b85ddd3ba9fb97d3a':
  Fix borderless colored button text color

Change-Id: If2e5ddbd5e520cd39f8d2520b9047da175cc5f75
This commit is contained in:
Alan Viverette
2016-05-26 01:01: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">