diff options
| author | Maurice Lam <yukl@google.com> | 2018-02-16 12:40:25 -0800 |
|---|---|---|
| committer | Maurice Lam <yukl@google.com> | 2018-02-16 13:22:26 -0800 |
| commit | f0001e7af7d641c0ce3112fd913d83448725ae63 (patch) | |
| tree | 914c2c9814ed205cf273808edcca31c917899432 | |
| parent | f034e011b28982afa69d8198bb9f56a589e19808 (diff) | |
| download | setupwizard-f0001e7af7d641c0ce3112fd913d83448725ae63.tar.gz | |
Set color primary to color accent
For GLIF v3, color accent is changed, and color primary should be
changed to match as well.
Test: ./gradlew test
Bug: 73253714
Change-Id: I553f4eaccc75abaedad4cf9e31d003d6c1f64660
| -rw-r--r-- | library/gingerbread/res/values/styles.xml | 4 | ||||
| -rw-r--r-- | library/platform/res/values-v27/styles.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml index 1dca8cd..2287d27 100644 --- a/library/gingerbread/res/values/styles.xml +++ b/library/gingerbread/res/values/styles.xml @@ -104,7 +104,7 @@ <item name="android:windowSoftInputMode">adjustResize</item> <item name="colorAccent">@color/suw_color_accent_glif_dark</item> - <item name="colorPrimary">@color/suw_color_accent_glif_dark</item> + <item name="colorPrimary">?attr/colorAccent</item> <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item> <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> <item name="suwButtonAllCaps">true</item> @@ -142,7 +142,7 @@ <item name="android:windowSoftInputMode">adjustResize</item> <item name="colorAccent">@color/suw_color_accent_glif_light</item> - <item name="colorPrimary">@color/suw_color_accent_glif_light</item> + <item name="colorPrimary">?attr/colorAccent</item> <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item> <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> <item name="suwButtonAllCaps">true</item> diff --git a/library/platform/res/values-v27/styles.xml b/library/platform/res/values-v27/styles.xml index 9284818..4833d60 100644 --- a/library/platform/res/values-v27/styles.xml +++ b/library/platform/res/values-v27/styles.xml @@ -90,7 +90,7 @@ <style name="SuwThemeGlif" parent="android:Theme.Material.NoActionBar"> <item name="android:colorAccent">@color/suw_color_accent_glif_dark</item> <item name="android:colorBackground">@color/suw_glif_background_color_dark</item> - <item name="android:colorPrimary">@color/suw_color_accent_glif_dark</item> + <item name="android:colorPrimary">?android:attr/colorAccent</item> <item name="android:indeterminateTint">?android:attr/colorPrimary</item> <!-- Specify the indeterminateTintMode to work around a bug in Lollipop --> <item name="android:indeterminateTintMode">src_in</item> @@ -125,7 +125,7 @@ <style name="SuwThemeGlif.Light" parent="android:Theme.Material.Light.NoActionBar"> <item name="android:colorAccent">@color/suw_color_accent_glif_light</item> <item name="android:colorBackground">@color/suw_glif_background_color_light</item> - <item name="android:colorPrimary">@color/suw_color_accent_glif_light</item> + <item name="android:colorPrimary">?android:attr/colorAccent</item> <item name="android:indeterminateTint">?android:attr/colorPrimary</item> <!-- Specify the indeterminateTintMode to work around a bug in Lollipop --> <item name="android:indeterminateTintMode">src_in</item> |