Merge "Add ripples to negative buttons" into nyc-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
95f905b3c0
@@ -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>
|
||||
|
Reference in New Issue
Block a user