summaryrefslogtreecommitdiff
path: root/library/gingerbread/res
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2017-04-25 19:16:09 -0700
committerMaurice Lam <yukl@google.com>2017-04-25 20:05:03 -0700
commit6011b35deae30839cd454e0ec5866487e90860f5 (patch)
tree14593ed645f53af3130273eba9f2e6c15bd7e743 /library/gingerbread/res
parentc9abaa5461d2757893be00d2ce34672d96b135bb (diff)
downloadsetupwizard-6011b35deae30839cd454e0ec5866487e90860f5.tar.gz
Allow setting DividerInsetEnd
- Added XML attribute suwDividerInsetEnd, and replaced suwDividerInset with suwDividerInsetStart. - Modified the themes so that the divider insets are set automatically. If the activity uses GLIF (v1) or material, and the list does not have icons, it should set app:suwDividerInsetStart="?attr/suwDividerInsetStartNoIcon" in the Glif[Recycler/List]Layout Test: ./gradlew connectedAndroidTest test Bug: 37677772 Change-Id: Ia4cb9954dd7e3c59cbc72db8937989557689061b
Diffstat (limited to 'library/gingerbread/res')
-rw-r--r--library/gingerbread/res/values/styles.xml14
1 files changed, 12 insertions, 2 deletions
diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml
index 533b7fe..62b8489 100644
--- a/library/gingerbread/res/values/styles.xml
+++ b/library/gingerbread/res/values/styles.xml
@@ -38,6 +38,9 @@
<item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
<item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
<item name="suwCardBackground">@drawable/suw_card_bg_dark</item>
+ <item name="suwDividerInsetEnd">0dp</item>
+ <item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item>
+ <item name="suwDividerInsetStartNoIcon">@dimen/suw_items_text_divider_inset</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>
@@ -65,6 +68,9 @@
<item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
<item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
<item name="suwCardBackground">@drawable/suw_card_bg_light</item>
+ <item name="suwDividerInsetEnd">0dp</item>
+ <item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item>
+ <item name="suwDividerInsetStartNoIcon">@dimen/suw_items_text_divider_inset</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>
@@ -93,7 +99,9 @@
<item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
<item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
<item name="suwColorPrimary">?attr/colorPrimary</item>
- <item name="suwDividerInset">@dimen/suw_items_glif_icon_divider_inset</item>
+ <item name="suwDividerInsetEnd">0dp</item>
+ <item name="suwDividerInsetStart">@dimen/suw_items_glif_icon_divider_inset</item>
+ <item name="suwDividerInsetStartNoIcon">@dimen/suw_items_glif_text_divider_inset</item>
<item name="suwGlifHeaderGravity">start</item>
<item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description.Glif</item>
<item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle.GlifDescription</item>
@@ -124,7 +132,9 @@
<item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
<item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
<item name="suwColorPrimary">?attr/colorPrimary</item>
- <item name="suwDividerInset">@dimen/suw_items_glif_icon_divider_inset</item>
+ <item name="suwDividerInsetEnd">0dp</item>
+ <item name="suwDividerInsetStart">@dimen/suw_items_glif_icon_divider_inset</item>
+ <item name="suwDividerInsetStartNoIcon">@dimen/suw_items_glif_text_divider_inset</item>
<item name="suwGlifHeaderGravity">start</item>
<item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description.Glif</item>
<item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle.GlifDescription</item>