diff options
| author | Colin Cross <ccross@android.com> | 2017-12-13 02:48:52 +0000 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-12-13 02:48:52 +0000 |
| commit | 46216d0e61318e7af168e9e903ef8d943bb49b2e (patch) | |
| tree | 0a3c2652a2f4641674611a17c5426f8b56ba21f3 /library/main/res/values/styles.xml | |
| parent | ba1332d1b4dd525a2ef313246482708cb2016052 (diff) | |
| download | setupwizard-46216d0e61318e7af168e9e903ef8d943bb49b2e.tar.gz | |
Revert "Changes needed to upgrade to new gradle version"
This reverts commit ba1332d1b4dd525a2ef313246482708cb2016052.
Reason for revert: Broke taimen builds in master
Change-Id: Iffffadbacae8c6c69907dcecc447f958cf6ce909
Diffstat (limited to 'library/main/res/values/styles.xml')
| -rw-r--r-- | library/main/res/values/styles.xml | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml index e1e229f..0e7685b 100644 --- a/library/main/res/values/styles.xml +++ b/library/main/res/values/styles.xml @@ -32,6 +32,9 @@ <item name="suwScrollIndicators">top|bottom</item> </style> + <!-- Deprecated. Use SuwThemeGlifV2 instead --> + <style name="SuwThemeGlifPixel" parent="SuwThemeGlifV2" /> + <style name="SuwThemeGlifV2.Light" parent="SuwThemeGlif.Light"> <item name="android:colorBackground">@color/suw_glif_background_color_light</item> <item name="android:windowLightStatusBar" tools:targetApi="m">true</item> @@ -45,6 +48,9 @@ <item name="suwScrollIndicators">top|bottom</item> </style> + <!-- 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> @@ -88,10 +94,11 @@ <item name="android:textAlignment" tools:targetApi="jelly_bean_mr1">gravity</item> </style> - <!-- Ignore UnusedResources: Used by clients --> - <style name="TextAppearance.SuwDescription.Secondary" - parent="TextAppearance.SuwDescription" - tools:ignore="UnusedResources"> + <style name="TextAppearance.SuwDescription.Light" parent="TextAppearance.SuwDescription"> + <item name="android:fontFamily" tools:ignore="NewApi">sans-serif-light</item> + </style> + + <style name="TextAppearance.SuwDescription.Secondary" parent="TextAppearance.SuwDescription"> <item name="android:textColor">?android:attr/textColorSecondary</item> </style> @@ -204,10 +211,7 @@ <item name="android:textAllCaps" tools:targetApi="ice_cream_sandwich">false</item> </style> - <!-- Ignore UnusedResources: used by clients --> - <style name="SuwGlifButton.Tertiary" - parent="SuwGlifButton.BaseTertiary" - tools:ignore="UnusedResources" /> + <style name="SuwGlifButton.Tertiary" parent="SuwGlifButton.BaseTertiary" /> <!-- The start and end paddings are asymmetric because start buttons are borderless buttons which aligns the text label. --> |