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/main/res | |
| 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/main/res')
| -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/main/res/values/colors.xml | 1 | ||||
| -rw-r--r-- | library/main/res/values/styles.xml | 8 |
4 files changed, 11 insertions, 1 deletions
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..4d90570 100644 --- a/library/main/res/color-v23/suw_flat_button_highlight.xml +++ b/library/main/res/color-v23/suw_flat_button_highlight.xml @@ -16,6 +16,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="?android:attr/colorAccent" + <item android:color="?attr/suwButtonColor" android:alpha="0.24" /> </selector> diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml index d378bb0..ec21f87 100644 --- a/library/main/res/values/attrs.xml +++ b/library/main/res/values/attrs.xml @@ -20,6 +20,7 @@ <!-- Theme attributes --> <attr name="suwLayoutTheme" format="reference" /> <attr name="suwMarginSides" format="dimension|reference" /> + <attr name="suwButtonColor" format="color" /> <!-- 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/main/res/values/colors.xml b/library/main/res/values/colors.xml index b20098d..7d2575e 100644 --- a/library/main/res/values/colors.xml +++ b/library/main/res/values/colors.xml @@ -44,5 +44,6 @@ <color name="suw_color_accent_glif_light">#ff4285f4</color> <color name="suw_glif_background_color_dark">#ff000000</color> <color name="suw_glif_background_color_light">#ffffffff</color> + <color name="suw_glif_v3_footer_button_color">#ff1a73e8</color> </resources> diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml index bd3b60f..0e7685b 100644 --- a/library/main/res/values/styles.xml +++ b/library/main/res/values/styles.xml @@ -51,6 +51,14 @@ <!-- Deprecated. Use SuwThemeGlifV2.Light instead --> <style name="SuwThemeGlifPixel.Light" parent="SuwThemeGlifV2.Light" /> + <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2"> + <item name="suwButtonColor">@color/suw_glif_v3_footer_button_color</item> + </style> + + <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light"> + <item name="suwButtonColor">@color/suw_glif_v3_footer_button_color</item> + </style> + <style name="Animation.SuwWindowAnimation" parent="@android:style/Animation.Activity"> <item name="android:activityOpenEnterAnimation">@anim/suw_slide_next_in</item> <item name="android:activityOpenExitAnimation">@anim/suw_slide_next_out</item> |