From e56d1ebc7d8f62db8d4ee6342af61ae2d5583ec1 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 6 May 2016 17:50:41 -0700
Subject: [PATCH] [SuwLib] Fix header style

Fixed various margins and paddings in the header style.

Bug: 28595212
Change-Id: I85ca3e1f7abb836c791f7225da4316748812845d
---
 library/eclair-mr1/res/values/styles.xml          |  4 ++++
 library/main/res/layout/suw_items_description.xml |  6 ++----
 library/main/res/values/attrs.xml                 |  1 +
 library/main/res/values/dimens.xml                |  9 ++++++---
 library/main/res/values/styles.xml                | 15 +++++++++++++++
 library/platform/res/values-v21/styles.xml        |  4 ++++
 6 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/library/eclair-mr1/res/values/styles.xml b/library/eclair-mr1/res/values/styles.xml
index 0b2dcda..9818012 100644
--- a/library/eclair-mr1/res/values/styles.xml
+++ b/library/eclair-mr1/res/values/styles.xml
@@ -36,6 +36,7 @@
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
         <item name="suwCardBackground">@drawable/suw_card_bg_dark</item>
+        <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description</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>
@@ -59,6 +60,7 @@
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
         <item name="suwCardBackground">@drawable/suw_card_bg_light</item>
+        <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description</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>
@@ -83,6 +85,7 @@
         <item name="colorPrimary">@color/suw_color_accent_glif_dark</item>
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
+        <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description.Glif</item>
         <item name="suwListItemIconColor">@color/suw_list_item_icon_color_dark</item>
         <item name="suwMarginSides">@dimen/suw_glif_margin_sides</item>
         <item name="textAppearanceListItem">@style/TextAppearance.SuwGlifItemTitle</item>
@@ -108,6 +111,7 @@
         <item name="colorPrimary">@color/suw_color_accent_glif_light</item>
         <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
         <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
+        <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description.Glif</item>
         <item name="suwListItemIconColor">@color/suw_list_item_icon_color_light</item>
         <item name="suwMarginSides">@dimen/suw_glif_margin_sides</item>
         <item name="textAppearanceListItem">@style/TextAppearance.SuwGlifItemTitle</item>
diff --git a/library/main/res/layout/suw_items_description.xml b/library/main/res/layout/suw_items_description.xml
index 8712be3..1af1f09 100644
--- a/library/main/res/layout/suw_items_description.xml
+++ b/library/main/res/layout/suw_items_description.xml
@@ -17,12 +17,10 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    style="@style/SuwItemContainer"
+    style="?attr/suwItemDescriptionStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:paddingTop="@dimen/suw_description_margin_top"
-    android:paddingBottom="@dimen/suw_description_margin_bottom_lists">
+    android:orientation="horizontal">
 
     <FrameLayout
         android:id="@+id/suw_items_icon_container"
diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml
index 8501e94..77e5252 100644
--- a/library/main/res/values/attrs.xml
+++ b/library/main/res/values/attrs.xml
@@ -36,6 +36,7 @@
     <attr name="suwHeader" format="reference" />
     <attr name="suwHeaderText" format="string" localization="suggested" />
     <attr name="suwDividerInset" format="dimension|reference" />
+    <attr name="suwItemDescriptionStyle" format="reference" />
 
     <declare-styleable name="SuwIllustration">
         <attr name="suwAspectRatio" format="float" />
diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml
index 55b9a45..ebdf982 100644
--- a/library/main/res/values/dimens.xml
+++ b/library/main/res/values/dimens.xml
@@ -20,7 +20,7 @@
     <!-- General -->
     <dimen name="suw_layout_margin_sides">40dp</dimen>
     <dimen name="suw_glif_margin_sides">24dp</dimen>
-    <dimen name="suw_glif_margin_top">24dp</dimen>
+    <dimen name="suw_glif_margin_top">48dp</dimen>
 
     <!-- Content styles -->
     <dimen name="suw_check_box_line_spacing_extra">4sp</dimen>
@@ -39,6 +39,9 @@
     <dimen name="suw_description_line_spacing_extra">4sp</dimen>
     <dimen name="suw_description_text_size">16sp</dimen>
 
+    <dimen name="suw_description_glif_margin_top">3dp</dimen>
+    <dimen name="suw_description_glif_margin_bottom_lists">4dp</dimen>
+
     <!-- Margin on the start to offset for margin in the drawable -->
     <dimen name="suw_radio_button_margin_start">-6dp</dimen>
     <dimen name="suw_radio_button_margin_top">0dp</dimen>
@@ -79,8 +82,8 @@
     <!-- This is the extra spacing required to make the leading exactly 32sp -->
     <dimen name="suw_header_title_line_spacing_extra">3.67sp</dimen>
 
-    <dimen name="suw_glif_header_title_margin_top">24dp</dimen>
-    <dimen name="suw_glif_header_title_margin_bottom">8dp</dimen>
+    <dimen name="suw_glif_header_title_margin_top">15dp</dimen>
+    <dimen name="suw_glif_header_title_margin_bottom">2dp</dimen>
 
     <dimen name="suw_glif_icon_max_height">32dp</dimen>
 
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml
index 7c845a2..4f0e09a 100644
--- a/library/main/res/values/styles.xml
+++ b/library/main/res/values/styles.xml
@@ -44,6 +44,10 @@
         <item name="android:textAppearance">@style/TextAppearance.SuwDescription</item>
     </style>
 
+    <style name="SuwDescription.Glif" parent="SuwDescription">
+        <item name="android:layout_marginTop">@dimen/suw_description_glif_margin_top</item>
+    </style>
+
     <style name="TextAppearance.SuwDescription.Light" parent="TextAppearance.SuwDescription">
         <item name="android:fontFamily" tools:ignore="NewApi">sans-serif-light</item>
     </style>
@@ -123,6 +127,17 @@
 
     <!-- Items styles -->
 
+    <style name="SuwItemContainer.Description" parent="SuwItemContainer">
+        <item name="android:paddingTop">@dimen/suw_description_margin_top</item>
+        <item name="android:paddingBottom">@dimen/suw_description_margin_bottom_lists</item>
+    </style>
+
+    <style name="SuwItemContainer.Description.Glif" parent="SuwItemContainer.Description">
+        <item name="android:minHeight">0dp</item>
+        <item name="android:paddingTop">@dimen/suw_description_glif_margin_top</item>
+        <item name="android:paddingBottom">@dimen/suw_description_glif_margin_bottom_lists</item>
+    </style>
+
     <style name="SuwItemContainer.Verbose" parent="SuwItemContainer">
         <item name="android:paddingBottom">@dimen/suw_items_verbose_padding_vertical</item>
         <item name="android:paddingTop">@dimen/suw_items_verbose_padding_vertical</item>
diff --git a/library/platform/res/values-v21/styles.xml b/library/platform/res/values-v21/styles.xml
index 8c74d58..36b3d57 100644
--- a/library/platform/res/values-v21/styles.xml
+++ b/library/platform/res/values-v21/styles.xml
@@ -41,6 +41,7 @@
         <item name="android:windowSoftInputMode">adjustResize</item>
 
         <item name="suwCardBackground">@drawable/suw_card_bg</item>
+        <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description</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>
@@ -63,6 +64,7 @@
         <item name="android:windowSoftInputMode">adjustResize</item>
 
         <item name="suwCardBackground">@drawable/suw_card_bg</item>
+        <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description</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>
@@ -87,6 +89,7 @@
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
 
+        <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description.Glif</item>
         <item name="suwListItemIconColor">@color/suw_list_item_icon_color_dark</item>
         <item name="suwMarginSides">@dimen/suw_glif_margin_sides</item>
     </style>
@@ -109,6 +112,7 @@
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
 
+        <item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description.Glif</item>
         <item name="suwListItemIconColor">@color/suw_list_item_icon_color_light</item>
         <item name="suwMarginSides">@dimen/suw_glif_margin_sides</item>
     </style>