diff options
| author | Nicole Huang <nicolehuang@google.com> | 2018-05-31 20:35:40 +0800 |
|---|---|---|
| committer | Nicole Huang <nicolehuang@google.com> | 2018-06-02 13:52:18 +0800 |
| commit | 72ed170f055d60d201c7840bd81b41b69568cc8d (patch) | |
| tree | c56763ccd2df886fc4371fd0b33eca26333295dd | |
| parent | a1df48d7dcba9a30aaacce833b9891b660ce4246 (diff) | |
| download | setupwizard-72ed170f055d60d201c7840bd81b41b69568cc8d.tar.gz | |
Modify the button highlight background color
Add attr "suwButtonHighlightAlpha" to customize the alpha value
for different themes
Bug: 80242585
Test: manual test
Change-Id: I7a3a340e3a9a5109717810cd0189aeaa45640709
| -rw-r--r-- | library/gingerbread/res/values/styles.xml | 4 | ||||
| -rw-r--r-- | library/main/res/color-v23/suw_flat_button_highlight.xml | 2 | ||||
| -rw-r--r-- | library/main/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | library/platform/res/values-v27/styles.xml | 4 |
4 files changed, 10 insertions, 1 deletions
diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml index 956b6cd..2cfe61a 100644 --- a/library/gingerbread/res/values/styles.xml +++ b/library/gingerbread/res/values/styles.xml @@ -41,6 +41,7 @@ <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> <item name="suwButtonAllCaps">true</item> <item name="suwButtonFontFamily">sans-serif</item> + <item name="suwButtonHighlightAlpha">0.24</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> @@ -75,6 +76,7 @@ <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> <item name="suwButtonAllCaps">true</item> <item name="suwButtonFontFamily">sans-serif</item> + <item name="suwButtonHighlightAlpha">0.24</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> @@ -110,6 +112,7 @@ <item name="suwButtonAllCaps">true</item> <item name="suwButtonCornerRadius">@dimen/suw_glif_button_corner_radius</item> <item name="suwButtonFontFamily">sans-serif-medium</item> + <item name="suwButtonHighlightAlpha">0.24</item> <item name="suwColorPrimary">?attr/colorPrimary</item> <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="suwDividerInsetEnd">0dp</item> @@ -149,6 +152,7 @@ <item name="suwButtonAllCaps">true</item> <item name="suwButtonCornerRadius">@dimen/suw_glif_button_corner_radius</item> <item name="suwButtonFontFamily">sans-serif-medium</item> + <item name="suwButtonHighlightAlpha">0.12</item> <item name="suwColorPrimary">?attr/colorPrimary</item> <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="suwDividerInsetEnd">0dp</item> diff --git a/library/main/res/color-v23/suw_flat_button_highlight.xml b/library/main/res/color-v23/suw_flat_button_highlight.xml index c5be14f..cdb1305 100644 --- a/library/main/res/color-v23/suw_flat_button_highlight.xml +++ b/library/main/res/color-v23/suw_flat_button_highlight.xml @@ -17,5 +17,5 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:color="?android:attr/colorAccent" - android:alpha="0.24" /> + android:alpha="?attr/suwButtonHighlightAlpha" /> </selector> diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml index b3fcfe9..86b27fa 100644 --- a/library/main/res/values/attrs.xml +++ b/library/main/res/values/attrs.xml @@ -21,6 +21,7 @@ <attr name="suwLayoutTheme" format="reference" /> <attr name="suwMarginSides" format="dimension|reference" /> <attr name="suwEditTextBackgroundColor" format="color" /> + <attr name="suwButtonHighlightAlpha" format="float" /> <!-- Subset of values in "gravity" in frameworks/base/core/res/res/values/attrs.xml. Only horizontal values are listed here as the header does not support vertical gravity. --> diff --git a/library/platform/res/values-v27/styles.xml b/library/platform/res/values-v27/styles.xml index 4739e24..e52fb09 100644 --- a/library/platform/res/values-v27/styles.xml +++ b/library/platform/res/values-v27/styles.xml @@ -44,6 +44,7 @@ <item name="suwButtonAllCaps">true</item> <item name="suwButtonFontFamily">sans-serif</item> + <item name="suwButtonHighlightAlpha">0.24</item> <item name="suwCardBackground">@drawable/suw_card_bg</item> <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="suwDividerInsetEnd">0dp</item> @@ -75,6 +76,7 @@ <item name="suwButtonAllCaps">true</item> <item name="suwButtonFontFamily">sans-serif</item> + <item name="suwButtonHighlightAlpha">0.24</item> <item name="suwCardBackground">@drawable/suw_card_bg</item> <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="suwDividerInsetEnd">0dp</item> @@ -110,6 +112,7 @@ <item name="suwButtonAllCaps">true</item> <item name="suwButtonCornerRadius">@dimen/suw_glif_button_corner_radius</item> <item name="suwButtonFontFamily">sans-serif-medium</item> + <item name="suwButtonHighlightAlpha">0.24</item> <item name="suwColorPrimary">?android:attr/colorPrimary</item> <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="suwDividerInsetEnd">0dp</item> @@ -146,6 +149,7 @@ <item name="suwButtonAllCaps">true</item> <item name="suwButtonCornerRadius">@dimen/suw_glif_button_corner_radius</item> <item name="suwButtonFontFamily">sans-serif-medium</item> + <item name="suwButtonHighlightAlpha">0.12</item> <item name="suwColorPrimary">?android:attr/colorPrimary</item> <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="suwDividerInsetEnd">0dp</item> |