diff options
| author | Maurice Lam <yukl@google.com> | 2017-04-06 13:11:50 -0700 |
|---|---|---|
| committer | Maurice Lam <yukl@google.com> | 2017-04-06 13:16:07 -0700 |
| commit | 24885729e3571ebca96c3fb8041f882d79e0fc0c (patch) | |
| tree | 5fa5d1c632cb2097f05301d527802e23020397f2 /library/gingerbread/res/values/styles.xml | |
| parent | c416fc6377cf4241db6fc950c17981ddd37d2484 (diff) | |
| download | setupwizard-24885729e3571ebca96c3fb8041f882d79e0fc0c.tar.gz | |
Fix description item with material theme
SuwItemTitle.Description style can be used with material theme and
therefore should not reference GLIF specific attributes. Created new
attribute suwItemDescriptionTitleStyle so that GLIF item can use a
GLIF specific style to adjust description text alignment, while
material theme will use the normal SuwTitle style.
Test: ./gradlew connectedAndroidTest test
Bug: 37033526
Change-Id: I0d162bf6984f6a2fbbf04143a256fb70862527b0
Diffstat (limited to 'library/gingerbread/res/values/styles.xml')
| -rw-r--r-- | library/gingerbread/res/values/styles.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml index 1ea468d..7ccbfe0 100644 --- a/library/gingerbread/res/values/styles.xml +++ b/library/gingerbread/res/values/styles.xml @@ -37,6 +37,7 @@ <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> <item name="suwCardBackground">@drawable/suw_card_bg_dark</item> <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description</item> + <item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle</item> <item name="suwListItemIconColor">@color/suw_list_item_icon_color_dark</item> <item name="suwMarginSides">@dimen/suw_layout_margin_sides</item> <item name="suwNavBarTheme">@style/SuwNavBarThemeDark</item> @@ -61,6 +62,7 @@ <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> <item name="suwCardBackground">@drawable/suw_card_bg_light</item> <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description</item> + <item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle</item> <item name="suwListItemIconColor">@color/suw_list_item_icon_color_light</item> <item name="suwMarginSides">@dimen/suw_layout_margin_sides</item> <item name="suwNavBarTheme">@style/SuwNavBarThemeLight</item> @@ -90,6 +92,7 @@ <item name="suwDividerInset">@dimen/suw_items_glif_icon_divider_inset</item> <item name="suwGlifHeaderGravity">start</item> <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description.Glif</item> + <item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle.GlifDescription</item> <item name="suwListItemIconColor">@color/suw_list_item_icon_color_dark</item> <item name="suwMarginSides">@dimen/suw_glif_margin_sides</item> <item name="suwScrollIndicators">bottom</item> @@ -120,6 +123,7 @@ <item name="suwDividerInset">@dimen/suw_items_glif_icon_divider_inset</item> <item name="suwGlifHeaderGravity">start</item> <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description.Glif</item> + <item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle.GlifDescription</item> <item name="suwListItemIconColor">@color/suw_list_item_icon_color_light</item> <item name="suwMarginSides">@dimen/suw_glif_margin_sides</item> <item name="suwScrollIndicators">bottom</item> |