diff options
| author | Maurice Lam <yukl@google.com> | 2018-02-15 17:43:23 -0800 |
|---|---|---|
| committer | Maurice Lam <yukl@google.com> | 2018-02-15 17:48:18 -0800 |
| commit | f034e011b28982afa69d8198bb9f56a589e19808 (patch) | |
| tree | 25b67727aa08ca2c20932950f603683be4256fd8 | |
| parent | af1e11f0746eb35cf2d624cef59876aba86676d0 (diff) | |
| download | setupwizard-f034e011b28982afa69d8198bb9f56a589e19808.tar.gz | |
Use google-sans-medium for GLIF buttons
Test: Manual, Existing tests pass
Bug: 73252680
Change-Id: Idb6c8821fc07eceae86f5574e3f4ec82cf3fcb8f
| -rw-r--r-- | library/gingerbread/res/values/styles.xml | 4 | ||||
| -rw-r--r-- | library/main/res/values/config.xml | 1 | ||||
| -rw-r--r-- | library/platform/res/values-v27/styles.xml | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml index 7a01fe7..1dca8cd 100644 --- a/library/gingerbread/res/values/styles.xml +++ b/library/gingerbread/res/values/styles.xml @@ -166,13 +166,13 @@ <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2"> <item name="colorAccent">@color/suw_color_accent_glif_v3</item> <item name="suwButtonAllCaps">false</item> - <item name="suwButtonFontFamily">@string/suwFontSecondary</item> + <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item> </style> <style name="SuwBaseThemeGlifV3.Light" parent="SuwThemeGlifV2.Light"> <item name="colorAccent">@color/suw_color_accent_glif_v3</item> <item name="suwButtonAllCaps">false</item> - <item name="suwButtonFontFamily">@string/suwFontSecondary</item> + <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item> </style> <style name="SuwThemeGlifV3.Light" parent="SuwBaseThemeGlifV3.Light" /> diff --git a/library/main/res/values/config.xml b/library/main/res/values/config.xml index 7fe5f9f..c11bf41 100644 --- a/library/main/res/values/config.xml +++ b/library/main/res/values/config.xml @@ -29,5 +29,6 @@ <!-- Secondary font for use with headings, title, and other non-body text --> <string name="suwFontSecondary" translatable="false">google-sans</string> + <string name="suwFontSecondaryMedium" translatable="false">google-sans-medium</string> </resources> diff --git a/library/platform/res/values-v27/styles.xml b/library/platform/res/values-v27/styles.xml index 7ef0fee..9284818 100644 --- a/library/platform/res/values-v27/styles.xml +++ b/library/platform/res/values-v27/styles.xml @@ -161,7 +161,7 @@ <item name="android:colorAccent">@color/suw_color_accent_glif_v3</item> <item name="suwButtonAllCaps">false</item> - <item name="suwButtonFontFamily">@string/suwFontSecondary</item> + <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item> </style> <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light"> @@ -171,7 +171,7 @@ <item name="android:windowLightNavigationBar">true</item> <item name="suwButtonAllCaps">false</item> - <item name="suwButtonFontFamily">@string/suwFontSecondary</item> + <item name="suwButtonFontFamily">@string/suwFontSecondaryMedium</item> </style> <!-- Button styles --> |