diff options
| author | Maurice Lam <yukl@google.com> | 2017-12-01 12:51:42 -0800 |
|---|---|---|
| committer | Maurice Lam <yukl@google.com> | 2017-12-01 12:51:42 -0800 |
| commit | 8b52391bba333441da82aed544bd58fae9586f15 (patch) | |
| tree | db882103738ee81997bf59d2baad2dfaba8d1ed6 /library/gingerbread/res/values/styles.xml | |
| parent | e2d1593a5a52765e60094542141b75c4e9a0ca04 (diff) | |
| download | setupwizard-8b52391bba333441da82aed544bd58fae9586f15.tar.gz | |
Add GLIF v3 theme and make buttons Google Blue 600
Test: ./gradlew test
Bug: 69930196
Change-Id: Iba6be8daad2f27925647e43a6a1c5e19c03fb7bb
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 6e525ef..9dcf770 100644 --- a/library/gingerbread/res/values/styles.xml +++ b/library/gingerbread/res/values/styles.xml @@ -38,6 +38,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> @@ -69,6 +70,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> @@ -101,6 +103,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> @@ -136,6 +139,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> @@ -197,11 +201,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"> @@ -216,6 +225,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> |