diff options
| author | Maurice Lam <yukl@google.com> | 2017-12-05 18:52:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-12-05 18:52:12 +0000 |
| commit | ac5ce544be357085d4c28475db7613d4da4a32c0 (patch) | |
| tree | 0a3c2652a2f4641674611a17c5426f8b56ba21f3 /library/gingerbread/res/values/styles.xml | |
| parent | a5cc73845d6c947d0277478c6a09e2c99e45b6e6 (diff) | |
| parent | 8b52391bba333441da82aed544bd58fae9586f15 (diff) | |
| download | setupwizard-ac5ce544be357085d4c28475db7613d4da4a32c0.tar.gz | |
Merge "Add GLIF v3 theme and make buttons Google Blue 600"
Diffstat (limited to 'library/gingerbread/res/values/styles.xml')
| -rw-r--r-- | library/gingerbread/res/values/styles.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml index b556f07..b510f75 100644 --- a/library/gingerbread/res/values/styles.xml +++ b/library/gingerbread/res/values/styles.xml @@ -39,6 +39,7 @@ <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item> <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> + <item name="suwButtonColor">?attr/colorAccent</item> <item name="suwCardBackground">@drawable/suw_card_bg_dark</item> <item name="suwDividerInsetEnd">0dp</item> <item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item> @@ -71,6 +72,7 @@ <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item> <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> + <item name="suwButtonColor">?attr/colorAccent</item> <item name="suwCardBackground">@drawable/suw_card_bg_light</item> <item name="suwDividerInsetEnd">0dp</item> <item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item> @@ -103,6 +105,7 @@ <item name="colorPrimary">@color/suw_color_accent_glif_dark</item> <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item> <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> + <item name="suwButtonColor">?attr/colorAccent</item> <item name="suwColorPrimary">?attr/colorPrimary</item> <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="suwDividerInsetEnd">0dp</item> @@ -138,6 +141,7 @@ <item name="colorPrimary">@color/suw_color_accent_glif_light</item> <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item> <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> + <item name="suwButtonColor">?attr/colorAccent</item> <item name="suwColorPrimary">?attr/colorPrimary</item> <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="suwDividerInsetEnd">0dp</item> @@ -199,11 +203,16 @@ ContextThemeWrapper. These self-referencing attributes make sure this is applied as both to the button. --> <item name="android:buttonStyle">@style/SuwGlifButton.Primary</item> + <item name="android:theme">@style/SuwGlifButton.Primary</item> <item name="buttonStyle">@style/SuwGlifButton.Primary</item> <!-- Values used in styles --> <item name="android:paddingLeft">@dimen/suw_glif_button_padding</item> <item name="android:paddingRight">@dimen/suw_glif_button_padding</item> + + <!-- Values used in themes --> + <item name="android:backgroundTint" tools:targetApi="lollipop">?attr/suwButtonColor</item> + <item name="backgroundTint">?attr/suwButtonColor</item> </style> <style name="SuwGlifButton.Secondary" parent="Widget.AppCompat.Button.Borderless.Colored"> @@ -218,6 +227,7 @@ <item name="android:minWidth">0dp</item> <item name="android:paddingLeft">@dimen/suw_glif_button_padding</item> <item name="android:paddingRight">@dimen/suw_glif_button_padding</item> + <item name="android:textColor">?attr/suwButtonColor</item> <!-- Values used in themes --> <item name="android:colorControlHighlight" tools:targetApi="lollipop">@color/suw_flat_button_highlight</item> |