diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-12-20 02:39:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-12-20 02:39:57 +0000 |
| commit | 0fcfb29db37045d6606a1623d6947aa69311413b (patch) | |
| tree | 584e74e1ebc99b9d1dcf594317c4dc718afc037f /library/gingerbread/res/values/styles.xml | |
| parent | 753d26e4f8f6dfb69dc99494a69be00d1ed74eb1 (diff) | |
| parent | e22d7c2b358d9c0f362627d3194b051719f2ba5c (diff) | |
| download | setupwizard-0fcfb29db37045d6606a1623d6947aa69311413b.tar.gz | |
Merge "Change accent color in GLIF V3"
Diffstat (limited to 'library/gingerbread/res/values/styles.xml')
| -rw-r--r-- | library/gingerbread/res/values/styles.xml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml index db2e8d8..3399178 100644 --- a/library/gingerbread/res/values/styles.xml +++ b/library/gingerbread/res/values/styles.xml @@ -39,7 +39,6 @@ <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> @@ -72,7 +71,6 @@ <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> @@ -105,7 +103,6 @@ <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> @@ -141,7 +138,6 @@ <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> @@ -157,6 +153,14 @@ <item name="textAppearanceListItemSmall">@style/TextAppearance.SuwGlifItemSummary</item> </style> + <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2"> + <item name="colorAccent">@color/suw_color_accent_glif_v3</item> + </style> + + <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light"> + <item name="colorAccent">@color/suw_color_accent_glif_v3</item> + </style> + <!-- Content styles --> <style name="TextAppearance.SuwDescription" parent="TextAppearance.AppCompat.Medium"> @@ -209,10 +213,6 @@ <!-- 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"> @@ -227,7 +227,6 @@ <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> |