Merge \\"Add ripples to negative buttons\\" into nyc-mr1-dev am: 95f905b3c0

am: b07f0cc650

Change-Id: I8214ab2c04eea59258c2402285ed9dbdc1ab6946
This commit is contained in:
Maurice Lam
2016-07-12 23:51:04 +00:00
committed by android-build-merger

View File

@@ -286,15 +286,18 @@
<item name="android:singleLine">true</item>
</style>
<style name="SetupWizardButton.Negative" parent="@android:style/TextAppearance.Widget.TextView">
<item name="android:background">@null</item>
<style name="SetupWizardButton.Negative" parent="@android:style/Widget.Material.Button.Borderless.Colored">
<item name="android:minWidth">0dp</item>
<item name="android:textAllCaps">false</item>
<item name="android:textColor">?android:attr/colorControlActivated</item>
<item name="android:theme">@style/AccentColorHighlightBorderlessButton</item>
</style>
<style name="SetupWizardButton.Positive" parent="@android:style/Widget.Material.Button.Colored" />
<style name="AccentColorHighlightBorderlessButton">
<item name="android:colorControlHighlight">?android:attr/colorAccent</item>
</style>
<style name="vpn_label">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>