4 files changed, 90 insertions, 6 deletions
diff --git a/library/main/res/layout/suw_glif_template.xml b/library/main/res/layout/suw_glif_template.xml
new file mode 100644
index 0000000..d9be0b8
--- /dev/null
+++ b/library/main/res/layout/suw_glif_template.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/suw_scroll_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/suw_layout_icon"
+            style="@style/SuwGlifIcon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@null" />
+
+        <TextView
+            android:id="@+id/suw_layout_title"
+            style="@style/SuwGlifHeaderTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <FrameLayout
+            android:id="@+id/suw_layout_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml
index 49ad430..209f81c 100644
--- a/library/main/res/values/attrs.xml
+++ b/library/main/res/values/attrs.xml
@@ -17,6 +17,7 @@
 
 <resources>
 
+    <!-- Theme attributes -->
     <attr name="suwLayoutTheme" format="reference" />
     <attr name="suwMarginSides" format="dimension|reference" />
 
@@ -26,6 +27,9 @@
     <attr name="suwNavBarTextColor" format="color" />
     <attr name="suwNavBarTheme" format="reference" />
 
+    <!-- Custom view attributes -->
+    <attr name="suwHeaderText" format="string" localization="suggested" />
+
     <declare-styleable name="SuwIllustration">
         <attr name="suwAspectRatio" format="float" />
     </declare-styleable>
@@ -34,10 +38,16 @@
         <attr name="suwHeader" format="reference" />
     </declare-styleable>
 
+    <declare-styleable name="SuwGlifLayout">
+        <attr name="android:icon" />
+        <attr name="suwHeaderColor" format="reference|color" />
+        <attr name="suwHeaderText" />
+    </declare-styleable>
+
     <declare-styleable name="SuwSetupWizardLayout">
         <attr name="suwBackground" format="color|reference" />
         <attr name="suwBackgroundTile" format="color|reference" />
-        <attr name="suwHeaderText" format="string" localization="suggested" />
+        <attr name="suwHeaderText" />
         <attr name="suwDecorPaddingTop" format="dimension|reference" />
         <attr name="suwIllustration" format="color|reference" />
         <attr name="suwIllustrationAspectRatio" format="float|reference" />
diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml
index 211f01d..e955d85 100644
--- a/library/main/res/values/dimens.xml
+++ b/library/main/res/values/dimens.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright (C) 2015 The Android Open Source Project
 
@@ -19,6 +19,8 @@
 
     <!-- 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>
 
     <!-- Content styles -->
     <dimen name="suw_check_box_line_spacing_extra">4sp</dimen>
@@ -69,6 +71,9 @@
     <!-- 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>
+
     <!-- Illustration -->
     <item name="suw_illustration_aspect_ratio" format="float" type="dimen">2.22</item>
 
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml
index a720471..787b5b9 100644
--- a/library/main/res/values/styles.xml
+++ b/library/main/res/values/styles.xml
@@ -96,19 +96,38 @@
 
     <!-- Header layout (for phones) -->
 
-    <style name="SuwHeaderTitle">
+    <style name="SuwBaseHeaderTitle">
         <!-- Before Honeycomb, layout_gravity is needed for FrameLayout to apply the margins -->
         <item name="android:layout_gravity">top</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:maxLines">2</item>
+        <item name="android:textSize">@dimen/suw_header_title_size</item>
+    </style>
+
+    <style name="SuwHeaderTitle" parent="SuwBaseHeaderTitle">
         <item name="android:layout_marginBottom">@dimen/suw_header_title_margin_bottom</item>
         <item name="android:layout_marginLeft">?attr/suwMarginSides</item>
         <item name="android:layout_marginRight">?attr/suwMarginSides</item>
-        <item name="android:ellipsize">end</item>
         <item name="android:lineSpacingExtra">@dimen/suw_header_title_line_spacing_extra</item>
-        <item name="android:maxLines">2</item>
         <item name="android:paddingBottom">@dimen/suw_header_title_padding_bottom</item>
         <item name="android:paddingTop">@dimen/suw_header_title_padding_top</item>
         <item name="android:textColor">@android:color/white</item>
-        <item name="android:textSize">@dimen/suw_header_title_size</item>
+    </style>
+
+    <!-- GLIF layout -->
+
+    <style name="SuwGlifHeaderTitle" parent="SuwBaseHeaderTitle">
+        <item name="android:layout_marginBottom">@dimen/suw_glif_header_title_margin_bottom</item>
+        <item name="android:layout_marginLeft">?attr/suwMarginSides</item>
+        <item name="android:layout_marginRight">?attr/suwMarginSides</item>
+        <item name="android:layout_marginTop">@dimen/suw_glif_header_title_margin_top</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+
+    <style name="SuwGlifIcon">
+        <item name="android:layout_marginLeft">?attr/suwMarginSides</item>
+        <item name="android:layout_marginRight">?attr/suwMarginSides</item>
+        <item name="android:layout_marginTop">@dimen/suw_glif_margin_top</item>
     </style>
 
     <!-- Navigation bar styles -->