Import updated Android Setupdesign Library 226288747

Test: mm , manually test PixelSetupWizard.apk
PiperOrigin-RevId: 226288747
Change-Id: I0b3d023cc770bf9ce13a3127fbc1c8a6919f888b

70 files changed, 141 insertions, 176 deletions

diff --git a/main/res/layout-v21/suw_progress_bar.xml b/main/res/layout-v21/sud_progress_bar.xml
index cbb69ea..cbb69ea 100644
--- a/main/res/layout-v21/suw_progress_bar.xml
+++ b/main/res/layout-v21/sud_progress_bar.xml
diff --git a/main/res/layout/suw_button.xml b/main/res/layout/sud_button.xml
index ede6270..ede6270 100644
--- a/main/res/layout/suw_button.xml
+++ b/main/res/layout/sud_button.xml
diff --git a/main/res/layout/suw_glif_blank_template_card.xml b/main/res/layout/sud_glif_blank_template_card.xml
index 9a95bdf..8530c6d 100644
--- a/main/res/layout/suw_glif_blank_template_card.xml
+++ b/main/res/layout/sud_glif_blank_template_card.xml
@@ -36,7 +36,7 @@
         android:layout_height="wrap_content"
         android:height="@dimen/suw_glif_card_height">
 
-        <include layout="@layout/suw_glif_blank_template_content" />
+        <include layout="@layout/sud_glif_blank_template_content" />
 
     </com.google.android.setupdesign.view.IntrinsicSizeFrameLayout>
 
diff --git a/main/res/layout/suw_glif_blank_template_compact.xml b/main/res/layout/sud_glif_blank_template_compact.xml
index 7e95075..1732e7d 100644
--- a/main/res/layout/suw_glif_blank_template_compact.xml
+++ b/main/res/layout/sud_glif_blank_template_compact.xml
@@ -21,6 +21,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/suw_glif_blank_template_content" />
+    <include layout="@layout/sud_glif_blank_template_content" />
 
 </com.google.android.setupcompat.view.StatusBarBackgroundLayout>
diff --git a/main/res/layout/suw_glif_blank_template_content.xml b/main/res/layout/sud_glif_blank_template_content.xml
index b34e68c..b34e68c 100644
--- a/main/res/layout/suw_glif_blank_template_content.xml
+++ b/main/res/layout/sud_glif_blank_template_content.xml
diff --git a/main/res/layout/suw_glif_header.xml b/main/res/layout/sud_glif_header.xml
index 420e989..c51e92d 100644
--- a/main/res/layout/suw_glif_header.xml
+++ b/main/res/layout/sud_glif_header.xml
@@ -44,6 +44,6 @@
         android:layout_marginRight="?attr/suwMarginSides"
         android:layout_marginTop="@dimen/suw_glif_progress_bar_margin_vertical"
         android:inflatedId="@+id/suw_layout_progress"
-        android:layout="@layout/suw_progress_bar" />
+        android:layout="@layout/sud_progress_bar" />
 
 </LinearLayout>
diff --git a/main/res/layout/suw_glif_list_template_card.xml b/main/res/layout/sud_glif_list_template_card.xml
index 3225c1b..6e3a716 100644
--- a/main/res/layout/suw_glif_list_template_card.xml
+++ b/main/res/layout/sud_glif_list_template_card.xml
@@ -36,7 +36,7 @@
         android:layout_height="wrap_content"
         android:height="@dimen/suw_glif_card_height">
 
-        <include layout="@layout/suw_glif_list_template_content" />
+        <include layout="@layout/sud_glif_list_template_content" />
 
     </com.google.android.setupdesign.view.IntrinsicSizeFrameLayout>
 
diff --git a/main/res/layout/suw_glif_list_template_compact.xml b/main/res/layout/sud_glif_list_template_compact.xml
index 8f7d59c..e509421 100644
--- a/main/res/layout/suw_glif_list_template_compact.xml
+++ b/main/res/layout/sud_glif_list_template_compact.xml
@@ -21,6 +21,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/suw_glif_list_template_content" />
+    <include layout="@layout/sud_glif_list_template_content" />
 
 </com.google.android.setupcompat.view.StatusBarBackgroundLayout>
diff --git a/main/res/layout/suw_glif_list_template_content.xml b/main/res/layout/sud_glif_list_template_content.xml
index ee24ee9..0145797 100644
--- a/main/res/layout/suw_glif_list_template_content.xml
+++ b/main/res/layout/sud_glif_list_template_content.xml
@@ -36,7 +36,7 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:scrollIndicators="?attr/suwScrollIndicators"
-        app:suwHeader="@layout/suw_glif_header"
+        app:suwHeader="@layout/sud_glif_header"
         tools:ignore="UnusedAttribute" />
 
     <ViewStub
diff --git a/main/res/layout/suw_glif_loading_screen.xml b/main/res/layout/sud_glif_loading_screen.xml
index 3bfbe07..3bfbe07 100644
--- a/main/res/layout/suw_glif_loading_screen.xml
+++ b/main/res/layout/sud_glif_loading_screen.xml
diff --git a/main/res/layout/suw_glif_preference_recycler_view.xml b/main/res/layout/sud_glif_preference_recycler_view.xml
index 5549ded..15be177 100644
--- a/main/res/layout/suw_glif_preference_recycler_view.xml
+++ b/main/res/layout/sud_glif_preference_recycler_view.xml
@@ -23,4 +23,4 @@
     android:layout_height="match_parent"
     android:clipChildren="false"
     android:scrollbars="vertical"
-    app:suwHeader="@layout/suw_glif_header" />
+    app:suwHeader="@layout/sud_glif_header" />
diff --git a/main/res/layout/suw_glif_recycler_template_card.xml b/main/res/layout/sud_glif_recycler_template_card.xml
index 3a415a7..8edf7ef 100644
--- a/main/res/layout/suw_glif_recycler_template_card.xml
+++ b/main/res/layout/sud_glif_recycler_template_card.xml
@@ -36,7 +36,7 @@
         android:layout_height="wrap_content"
         android:height="@dimen/suw_glif_card_height">
 
-        <include layout="@layout/suw_glif_recycler_template_content" />
+        <include layout="@layout/sud_glif_recycler_template_content" />
 
     </com.google.android.setupdesign.view.IntrinsicSizeFrameLayout>
 
diff --git a/main/res/layout/suw_glif_recycler_template_compact.xml b/main/res/layout/sud_glif_recycler_template_compact.xml
index 1e031cb..cddddbe 100644
--- a/main/res/layout/suw_glif_recycler_template_compact.xml
+++ b/main/res/layout/sud_glif_recycler_template_compact.xml
@@ -21,6 +21,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/suw_glif_recycler_template_content" />
+    <include layout="@layout/sud_glif_recycler_template_content" />
 
 </com.google.android.setupcompat.view.StatusBarBackgroundLayout>
diff --git a/main/res/layout/suw_glif_recycler_template_content.xml b/main/res/layout/sud_glif_recycler_template_content.xml
index 02f5605..64d7b2a 100644
--- a/main/res/layout/suw_glif_recycler_template_content.xml
+++ b/main/res/layout/sud_glif_recycler_template_content.xml
@@ -37,7 +37,7 @@
         android:layout_weight="1"
         android:scrollbars="vertical"
         android:scrollIndicators="?attr/suwScrollIndicators"
-        app:suwHeader="@layout/suw_glif_header"
+        app:suwHeader="@layout/sud_glif_header"
         tools:ignore="UnusedAttribute" />
 
     <ViewStub
diff --git a/main/res/layout/suw_glif_template_card.xml b/main/res/layout/sud_glif_template_card.xml
index 6681c73..39c3340 100644
--- a/main/res/layout/suw_glif_template_card.xml
+++ b/main/res/layout/sud_glif_template_card.xml
@@ -36,7 +36,7 @@
         android:layout_height="wrap_content"
         android:height="@dimen/suw_glif_card_height">
 
-        <include layout="@layout/suw_glif_template_content" />
+        <include layout="@layout/sud_glif_template_content" />
 
     </com.google.android.setupdesign.view.IntrinsicSizeFrameLayout>
 
diff --git a/main/res/layout/suw_glif_template_compact.xml b/main/res/layout/sud_glif_template_compact.xml
index c507b45..dc466be 100644
--- a/main/res/layout/suw_glif_template_compact.xml
+++ b/main/res/layout/sud_glif_template_compact.xml
@@ -21,6 +21,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/suw_glif_template_content" />
+    <include layout="@layout/sud_glif_template_content" />
 
 </com.google.android.setupcompat.view.StatusBarBackgroundLayout>
diff --git a/main/res/layout/suw_glif_template_content.xml b/main/res/layout/sud_glif_template_content.xml
index f50c57d..13e0e07 100644
--- a/main/res/layout/suw_glif_template_content.xml
+++ b/main/res/layout/sud_glif_template_content.xml
@@ -43,7 +43,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <include layout="@layout/suw_glif_header" />
+            <include layout="@layout/sud_glif_header" />
 
             <FrameLayout
                 android:id="@+id/suw_layout_content"
diff --git a/main/res/layout/suw_items_button_bar.xml b/main/res/layout/sud_items_button_bar.xml
index 9f863be..9f863be 100644
--- a/main/res/layout/suw_items_button_bar.xml
+++ b/main/res/layout/sud_items_button_bar.xml
diff --git a/main/res/layout/suw_items_default.xml b/main/res/layout/sud_items_default.xml
index 5288452..5288452 100644
--- a/main/res/layout/suw_items_default.xml
+++ b/main/res/layout/sud_items_default.xml
diff --git a/main/res/layout/suw_items_description.xml b/main/res/layout/sud_items_description.xml
index 7f2ccb6..7f2ccb6 100644
--- a/main/res/layout/suw_items_description.xml
+++ b/main/res/layout/sud_items_description.xml
diff --git a/main/res/layout/suw_items_expandable_switch.xml b/main/res/layout/sud_items_expandable_switch.xml
index a1811a7..1e81fab 100644
--- a/main/res/layout/suw_items_expandable_switch.xml
+++ b/main/res/layout/sud_items_expandable_switch.xml
@@ -24,7 +24,7 @@
     android:tag="noBackground">
 
     <com.google.android.setupdesign.view.CheckableLinearLayout
-        android:id="@+id/suw_items_expandable_switch_content"
+        android:id="@+id/sud_items_expandable_switch_content"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         style="@style/SuwItemContainer"
@@ -70,7 +70,7 @@
                 android:drawableRight="@drawable/suw_ic_expand"
                 android:duplicateParentState="true"
                 android:gravity="start"
-                android:labelFor="@+id/suw_items_switch"
+                android:labelFor="@+id/sud_items_switch"
                 android:textAlignment="viewStart"
                 tools:ignore="UnusedAttribute" />
 
@@ -90,7 +90,7 @@
     </com.google.android.setupdesign.view.CheckableLinearLayout>
 
     <View
-        android:id="@+id/suw_items_switch_divider"
+        android:id="@+id/sud_items_switch_divider"
         android:layout_width="1dp"
         android:layout_height="@dimen/suw_switch_divider_height"
         android:layout_gravity="top"
@@ -98,7 +98,7 @@
         android:background="?android:attr/listDivider" />
 
     <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/suw_items_switch"
+        android:id="@+id/sud_items_switch"
         style="@style/SuwSwitchStyle.Divided"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
diff --git a/main/res/layout/suw_items_switch.xml b/main/res/layout/sud_items_switch.xml
index 3aa5ca2..512e8d7 100644
--- a/main/res/layout/suw_items_switch.xml
+++ b/main/res/layout/sud_items_switch.xml
@@ -51,7 +51,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="start"
-            android:labelFor="@+id/suw_items_switch"
+            android:labelFor="@+id/sud_items_switch"
             android:textAlignment="viewStart"
             tools:ignore="UnusedAttribute" />
 
@@ -68,7 +68,7 @@
     </LinearLayout>
 
     <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/suw_items_switch"
+        android:id="@+id/sud_items_switch"
         style="@style/SuwSwitchStyle"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
diff --git a/main/res/layout/suw_items_switch_verbose.xml b/main/res/layout/sud_items_switch_verbose.xml
index 8cc350d..509bfc7 100644
--- a/main/res/layout/suw_items_switch_verbose.xml
+++ b/main/res/layout/sud_items_switch_verbose.xml
@@ -54,7 +54,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="start"
-            android:labelFor="@+id/suw_items_switch"
+            android:labelFor="@+id/sud_items_switch"
             android:textAlignment="viewStart"
             tools:ignore="UnusedAttribute" />
 
@@ -71,7 +71,7 @@
     </LinearLayout>
 
     <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/suw_items_switch"
+        android:id="@+id/sud_items_switch"
         style="@style/SuwSwitchStyle"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
diff --git a/main/res/layout/suw_items_verbose.xml b/main/res/layout/sud_items_verbose.xml
index 85e6885..85e6885 100644
--- a/main/res/layout/suw_items_verbose.xml
+++ b/main/res/layout/sud_items_verbose.xml
diff --git a/main/res/layout/suw_list_header.xml b/main/res/layout/sud_list_header.xml
index b2faa64..5cda917 100644
--- a/main/res/layout/suw_list_header.xml
+++ b/main/res/layout/sud_list_header.xml
@@ -42,6 +42,6 @@
 
     </com.google.android.setupdesign.view.Illustration>
 
-    <include layout="@layout/suw_progress_bar_stub" />
+    <include layout="@layout/sud_progress_bar_stub" />
 
 </LinearLayout>
diff --git a/main/res/layout/suw_list_template_card.xml b/main/res/layout/sud_list_template_card.xml
index 65ebc37..ff93a02 100644
--- a/main/res/layout/suw_list_template_card.xml
+++ b/main/res/layout/sud_list_template_card.xml
@@ -54,7 +54,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
 
-                <include layout="@layout/suw_progress_bar_stub" />
+                <include layout="@layout/sud_progress_bar_stub" />
 
             </FrameLayout>
 
diff --git a/main/res/layout/suw_list_template_card_wide.xml b/main/res/layout/sud_list_template_card_wide.xml
index bd3b601..d71dfbf 100644
--- a/main/res/layout/suw_list_template_card_wide.xml
+++ b/main/res/layout/sud_list_template_card_wide.xml
@@ -55,7 +55,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
 
-                <include layout="@layout/suw_progress_bar_stub" />
+                <include layout="@layout/sud_progress_bar_stub" />
 
             </FrameLayout>
 
diff --git a/main/res/layout/suw_list_template_header.xml b/main/res/layout/sud_list_template_header.xml
index 091a6c6..4080675 100644
--- a/main/res/layout/suw_list_template_header.xml
+++ b/main/res/layout/sud_list_template_header.xml
@@ -27,7 +27,7 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:clipChildren="false"
-        app:suwHeader="@layout/suw_list_header" />
+        app:suwHeader="@layout/sud_list_header" />
 
     <com.google.android.setupdesign.view.NavigationBar
         android:id="@+id/suw_layout_navigation_bar"
diff --git a/main/res/layout/suw_list_template_header_collapsed.xml b/main/res/layout/sud_list_template_header_collapsed.xml
index 4d7be86..02f4745 100644
--- a/main/res/layout/suw_list_template_header_collapsed.xml
+++ b/main/res/layout/sud_list_template_header_collapsed.xml
@@ -37,7 +37,7 @@
 
     </FrameLayout>
 
-    <include layout="@layout/suw_progress_bar_stub" />
+    <include layout="@layout/sud_progress_bar_stub" />
 
     <ListView
         android:id="@android:id/list"
diff --git a/main/res/layout/suw_navbar_view.xml b/main/res/layout/sud_navbar_view.xml
index 3e9c6e8..3e9c6e8 100644
--- a/main/res/layout/suw_navbar_view.xml
+++ b/main/res/layout/sud_navbar_view.xml
diff --git a/main/res/layout/suw_no_scroll_template_card.xml b/main/res/layout/sud_no_scroll_template_card.xml
index 0821b74..8d7ca77 100644
--- a/main/res/layout/suw_no_scroll_template_card.xml
+++ b/main/res/layout/sud_no_scroll_template_card.xml
@@ -57,7 +57,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
 
-                <include layout="@layout/suw_progress_bar_stub" />
+                <include layout="@layout/sud_progress_bar_stub" />
 
             </FrameLayout>
 
diff --git a/main/res/layout/suw_no_scroll_template_card_wide.xml b/main/res/layout/sud_no_scroll_template_card_wide.xml
index f0c865c..fca3cc4 100644
--- a/main/res/layout/suw_no_scroll_template_card_wide.xml
+++ b/main/res/layout/sud_no_scroll_template_card_wide.xml
@@ -58,7 +58,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
 
-                <include layout="@layout/suw_progress_bar_stub" />
+                <include layout="@layout/sud_progress_bar_stub" />
 
             </FrameLayout>
 
diff --git a/main/res/layout/suw_no_scroll_template_header.xml b/main/res/layout/sud_no_scroll_template_header.xml
index 320b832..00cd89c 100644
--- a/main/res/layout/suw_no_scroll_template_header.xml
+++ b/main/res/layout/sud_no_scroll_template_header.xml
@@ -50,7 +50,7 @@
 
         </com.google.android.setupdesign.view.Illustration>
 
-        <include layout="@layout/suw_progress_bar_stub" />
+        <include layout="@layout/sud_progress_bar_stub" />
 
         <FrameLayout
             android:id="@+id/suw_layout_content"
diff --git a/main/res/layout/suw_no_scroll_template_header_collapsed.xml b/main/res/layout/sud_no_scroll_template_header_collapsed.xml
index 6568b85..1aec162 100644
--- a/main/res/layout/suw_no_scroll_template_header_collapsed.xml
+++ b/main/res/layout/sud_no_scroll_template_header_collapsed.xml
@@ -40,7 +40,7 @@
 
     </FrameLayout>
 
-    <include layout="@layout/suw_progress_bar_stub" />
+    <include layout="@layout/sud_progress_bar_stub" />
 
     <FrameLayout android:id="@+id/suw_layout_content"
         android:layout_width="match_parent"
diff --git a/main/res/layout/suw_preference_recycler_view_header.xml b/main/res/layout/sud_preference_recycler_view_header.xml
index 4a6431b..db52cd5 100644
--- a/main/res/layout/suw_preference_recycler_view_header.xml
+++ b/main/res/layout/sud_preference_recycler_view_header.xml
@@ -23,4 +23,4 @@
     android:layout_height="match_parent"
     android:clipChildren="false"
     android:scrollbars="vertical"
-    app:suwHeader="@layout/suw_list_header" />
+    app:suwHeader="@layout/sud_list_header" />
diff --git a/main/res/layout/suw_preference_recycler_view_normal.xml b/main/res/layout/sud_preference_recycler_view_normal.xml
index 088a35c..088a35c 100644
--- a/main/res/layout/suw_preference_recycler_view_normal.xml
+++ b/main/res/layout/sud_preference_recycler_view_normal.xml
diff --git a/main/res/layout/suw_preference_template_header.xml b/main/res/layout/sud_preference_template_header.xml
index 61c2daf..61c2daf 100644
--- a/main/res/layout/suw_preference_template_header.xml
+++ b/main/res/layout/sud_preference_template_header.xml
diff --git a/main/res/layout/suw_progress_bar.xml b/main/res/layout/sud_progress_bar.xml
index 35e0faf..35e0faf 100644
--- a/main/res/layout/suw_progress_bar.xml
+++ b/main/res/layout/sud_progress_bar.xml
diff --git a/main/res/layout/suw_progress_bar_stub.xml b/main/res/layout/sud_progress_bar_stub.xml
index 3a03375..917a242 100644
--- a/main/res/layout/suw_progress_bar_stub.xml
+++ b/main/res/layout/sud_progress_bar_stub.xml
@@ -22,4 +22,4 @@
     android:layout_marginBottom="@dimen/suw_progress_bar_margin_vertical"
     android:layout_marginTop="@dimen/suw_progress_bar_margin_vertical"
     android:inflatedId="@+id/suw_layout_progress"
-    android:layout="@layout/suw_progress_bar" />
+    android:layout="@layout/sud_progress_bar" />
diff --git a/main/res/layout/suw_recycler_template_card.xml b/main/res/layout/sud_recycler_template_card.xml
index 45b322e..86c66d1 100644
--- a/main/res/layout/suw_recycler_template_card.xml
+++ b/main/res/layout/sud_recycler_template_card.xml
@@ -60,7 +60,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
 
-                <include layout="@layout/suw_progress_bar_stub" />
+                <include layout="@layout/sud_progress_bar_stub" />
 
             </FrameLayout>
 
diff --git a/main/res/layout/suw_recycler_template_card_wide.xml b/main/res/layout/sud_recycler_template_card_wide.xml
index 08447eb..1d25bb3 100644
--- a/main/res/layout/suw_recycler_template_card_wide.xml
+++ b/main/res/layout/sud_recycler_template_card_wide.xml
@@ -61,7 +61,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
 
-                <include layout="@layout/suw_progress_bar_stub" />
+                <include layout="@layout/sud_progress_bar_stub" />
 
             </FrameLayout>
 
diff --git a/main/res/layout/suw_recycler_template_header.xml b/main/res/layout/sud_recycler_template_header.xml
index d19fc42..3cab166 100644
--- a/main/res/layout/suw_recycler_template_header.xml
+++ b/main/res/layout/sud_recycler_template_header.xml
@@ -28,7 +28,7 @@
         android:layout_weight="1"
         android:clipChildren="false"
         android:scrollbars="vertical"
-        app:suwHeader="@layout/suw_list_header" />
+        app:suwHeader="@layout/sud_list_header" />
 
     <com.google.android.setupdesign.view.NavigationBar
         android:id="@+id/suw_layout_navigation_bar"
diff --git a/main/res/layout/suw_recycler_template_header_collapsed.xml b/main/res/layout/sud_recycler_template_header_collapsed.xml
index 1174ac2..973f5e0 100644
--- a/main/res/layout/suw_recycler_template_header_collapsed.xml
+++ b/main/res/layout/sud_recycler_template_header_collapsed.xml
@@ -37,7 +37,7 @@
 
     </FrameLayout>
 
-    <include layout="@layout/suw_progress_bar_stub" />
+    <include layout="@layout/sud_progress_bar_stub" />
 
     <FrameLayout
         android:layout_width="match_parent"
diff --git a/main/res/layout/suw_template_card.xml b/main/res/layout/sud_template_card.xml
index 7f0ff2d..ea6717d 100644
--- a/main/res/layout/suw_template_card.xml
+++ b/main/res/layout/sud_template_card.xml
@@ -63,7 +63,7 @@
 
                 </com.google.android.setupdesign.view.BottomScrollView>
 
-                <include layout="@layout/suw_progress_bar_stub" />
+                <include layout="@layout/sud_progress_bar_stub" />
 
             </FrameLayout>
 
diff --git a/main/res/layout/suw_template_card_wide.xml b/main/res/layout/sud_template_card_wide.xml
index 90482d5..1eabc3b 100644
--- a/main/res/layout/suw_template_card_wide.xml
+++ b/main/res/layout/sud_template_card_wide.xml
@@ -63,7 +63,7 @@
 
                 </com.google.android.setupdesign.view.BottomScrollView>
 
-                <include layout="@layout/suw_progress_bar_stub" />
+                <include layout="@layout/sud_progress_bar_stub" />
 
             </FrameLayout>
 
diff --git a/main/res/layout/suw_template_header.xml b/main/res/layout/sud_template_header.xml
index a8e54d0..634be13 100644
--- a/main/res/layout/suw_template_header.xml
+++ b/main/res/layout/sud_template_header.xml
@@ -64,7 +64,7 @@
 
                 </com.google.android.setupdesign.view.Illustration>
 
-                <include layout="@layout/suw_progress_bar_stub" />
+                <include layout="@layout/sud_progress_bar_stub" />
 
             </LinearLayout>
 
diff --git a/main/res/layout/suw_template_header_collapsed.xml b/main/res/layout/sud_template_header_collapsed.xml
index b3b0aef..48003ab 100644
--- a/main/res/layout/suw_template_header_collapsed.xml
+++ b/main/res/layout/sud_template_header_collapsed.xml
@@ -44,7 +44,7 @@
         android:layout_marginBottom="@dimen/suw_progress_bar_margin_vertical"
         android:layout_marginTop="@dimen/suw_progress_bar_margin_vertical"
         android:inflatedId="@+id/suw_layout_progress"
-        android:layout="@layout/suw_progress_bar" />
+        android:layout="@layout/sud_progress_bar" />
 
     <com.google.android.setupdesign.view.BottomScrollView
         android:id="@+id/suw_bottom_scroll_view"
diff --git a/main/res/layout/suw_glif_footer_button_bar.xml b/main/res/layout/suw_glif_footer_button_bar.xml
deleted file mode 100644
index f31dfe1..0000000
--- a/main/res/layout/suw_glif_footer_button_bar.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (C) 2017 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.
--->
-
-<com.google.android.setupdesign.view.ButtonBarLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/suw_footer_button_bar"
-    style="@style/SuwGlifButtonBar.Stackable"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content" />
diff --git a/main/res/layout/suw_glif_preference_template_header.xml b/main/res/layout/suw_glif_preference_template_header.xml
deleted file mode 100644
index 064ce74..0000000
--- a/main/res/layout/suw_glif_preference_template_header.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (C) 2016 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:ignore="UnusedResources">
-    <!-- Ignore UnusedResources: can be used by clients -->
-
-    <FrameLayout
-        android:id="@+id/suw_layout_content"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
-
-    <com.google.android.setupdesign.view.NavigationBar
-        android:id="@+id/suw_layout_navigation_bar"
-        style="@style/SuwNavBarTheme"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/suw_navbar_height" />
-
-</LinearLayout>
diff --git a/main/res/values-land/layouts.xml b/main/res/values-land/layouts.xml
index 152abf7..4531b86 100644
--- a/main/res/values-land/layouts.xml
+++ b/main/res/values-land/layouts.xml
@@ -17,16 +17,16 @@
 
 <resources>
 
-    <item name="suw_template" type="layout">@layout/suw_template_header_collapsed</item>
-    <item name="suw_template_short" type="layout">@layout/suw_template_header_collapsed</item>
-    <item name="suw_list_template" type="layout">@layout/suw_list_template_header_collapsed</item>
-    <item name="suw_list_template_short" type="layout">@layout/suw_list_template_header_collapsed</item>
-    <item name="suw_no_scroll_template" type="layout">@layout/suw_no_scroll_template_header_collapsed</item>
-    <item name="suw_no_scroll_template_short" type="layout">@layout/suw_no_scroll_template_header_collapsed</item>
-    <item name="suw_preference_recycler_view" type="layout">@layout/suw_preference_recycler_view_normal</item>
-    <item name="suw_preference_template" type="layout">@layout/suw_no_scroll_template_header_collapsed</item>
-    <item name="suw_recycler_template" type="layout">@layout/suw_recycler_template_header_collapsed</item>
-    <item name="suw_recycler_template_short" type="layout">@layout/suw_recycler_template_header_collapsed</item>
+    <item name="sud_template" type="layout">@layout/sud_template_header_collapsed</item>
+    <item name="sud_template_short" type="layout">@layout/sud_template_header_collapsed</item>
+    <item name="sud_list_template" type="layout">@layout/sud_list_template_header_collapsed</item>
+    <item name="sud_list_template_short" type="layout">@layout/sud_list_template_header_collapsed</item>
+    <item name="sud_no_scroll_template" type="layout">@layout/sud_no_scroll_template_header_collapsed</item>
+    <item name="sud_no_scroll_template_short" type="layout">@layout/sud_no_scroll_template_header_collapsed</item>
+    <item name="sud_preference_recycler_view" type="layout">@layout/sud_preference_recycler_view_normal</item>
+    <item name="sud_preference_template" type="layout">@layout/sud_no_scroll_template_header_collapsed</item>
+    <item name="sud_recycler_template" type="layout">@layout/sud_recycler_template_header_collapsed</item>
+    <item name="sud_recycler_template_short" type="layout">@layout/sud_recycler_template_header_collapsed</item>
 
 </resources>
 
diff --git a/main/res/values-sw600dp-land/layouts.xml b/main/res/values-sw600dp-land/layouts.xml
index db8250b..7be8581 100644
--- a/main/res/values-sw600dp-land/layouts.xml
+++ b/main/res/values-sw600dp-land/layouts.xml
@@ -17,16 +17,16 @@
 
 <resources>
 
-    <item name="suw_template" type="layout">@layout/suw_template_card_wide</item>
-    <item name="suw_template_short" type="layout">@layout/suw_template_card_wide</item>
-    <item name="suw_list_template" type="layout">@layout/suw_list_template_card_wide</item>
-    <item name="suw_list_template_short" type="layout">@layout/suw_list_template_card_wide</item>
-    <item name="suw_no_scroll_template" type="layout">@layout/suw_no_scroll_template_card_wide</item>
-    <item name="suw_no_scroll_template_short" type="layout">@layout/suw_no_scroll_template_card_wide</item>
-    <item name="suw_preference_recycler_view" type="layout">@layout/suw_preference_recycler_view_normal</item>
-    <item name="suw_preference_template" type="layout">@layout/suw_no_scroll_template_card_wide</item>
-    <item name="suw_recycler_template" type="layout">@layout/suw_recycler_template_card_wide</item>
-    <item name="suw_recycler_template_short" type="layout">@layout/suw_recycler_template_card_wide</item>
+    <item name="sud_template" type="layout">@layout/sud_template_card_wide</item>
+    <item name="sud_template_short" type="layout">@layout/sud_template_card_wide</item>
+    <item name="sud_list_template" type="layout">@layout/sud_list_template_card_wide</item>
+    <item name="sud_list_template_short" type="layout">@layout/sud_list_template_card_wide</item>
+    <item name="sud_no_scroll_template" type="layout">@layout/sud_no_scroll_template_card_wide</item>
+    <item name="sud_no_scroll_template_short" type="layout">@layout/sud_no_scroll_template_card_wide</item>
+    <item name="sud_preference_recycler_view" type="layout">@layout/sud_preference_recycler_view_normal</item>
+    <item name="sud_preference_template" type="layout">@layout/sud_no_scroll_template_card_wide</item>
+    <item name="sud_recycler_template" type="layout">@layout/sud_recycler_template_card_wide</item>
+    <item name="sud_recycler_template_short" type="layout">@layout/sud_recycler_template_card_wide</item>
 
 </resources>
 
diff --git a/main/res/values-sw600dp/layouts.xml b/main/res/values-sw600dp/layouts.xml
index fda82af..3c27d25 100644
--- a/main/res/values-sw600dp/layouts.xml
+++ b/main/res/values-sw600dp/layouts.xml
@@ -17,24 +17,24 @@
 
 <resources>
 
-    <item name="suw_template" type="layout">@layout/suw_template_card</item>
-    <item name="suw_template_short" type="layout">@layout/suw_template_card</item>
-    <item name="suw_list_template" type="layout">@layout/suw_list_template_card</item>
-    <item name="suw_list_template_short" type="layout">@layout/suw_list_template_card</item>
-    <item name="suw_no_scroll_template" type="layout">@layout/suw_no_scroll_template_card</item>
-    <item name="suw_no_scroll_template_short" type="layout">@layout/suw_no_scroll_template_card</item>
-
-    <item name="suw_glif_template" type="layout">@layout/suw_glif_template_card</item>
-    <item name="suw_glif_list_template" type="layout">@layout/suw_glif_list_template_card</item>
-    <item name="suw_glif_blank_template" type="layout">@layout/suw_glif_blank_template_card</item>
-
-    <item name="suw_preference_recycler_view" type="layout">@layout/suw_preference_recycler_view_normal</item>
-    <item name="suw_preference_template" type="layout">@layout/suw_no_scroll_template_card</item>
-    <item name="suw_recycler_template" type="layout">@layout/suw_recycler_template_card</item>
-    <item name="suw_recycler_template_short" type="layout">@layout/suw_recycler_template_card</item>
-
-    <item name="suw_glif_preference_template" type="layout">@layout/suw_glif_blank_template_card</item>
-    <item name="suw_glif_recycler_template" type="layout">@layout/suw_glif_recycler_template_card</item>
+    <item name="sud_template" type="layout">@layout/sud_template_card</item>
+    <item name="sud_template_short" type="layout">@layout/sud_template_card</item>
+    <item name="sud_list_template" type="layout">@layout/sud_list_template_card</item>
+    <item name="sud_list_template_short" type="layout">@layout/sud_list_template_card</item>
+    <item name="sud_no_scroll_template" type="layout">@layout/sud_no_scroll_template_card</item>
+    <item name="sud_no_scroll_template_short" type="layout">@layout/sud_no_scroll_template_card</item>
+
+    <item name="sud_glif_template" type="layout">@layout/sud_glif_template_card</item>
+    <item name="sud_glif_list_template" type="layout">@layout/sud_glif_list_template_card</item>
+    <item name="sud_glif_blank_template" type="layout">@layout/sud_glif_blank_template_card</item>
+
+    <item name="sud_preference_recycler_view" type="layout">@layout/sud_preference_recycler_view_normal</item>
+    <item name="sud_preference_template" type="layout">@layout/sud_no_scroll_template_card</item>
+    <item name="sud_recycler_template" type="layout">@layout/sud_recycler_template_card</item>
+    <item name="sud_recycler_template_short" type="layout">@layout/sud_recycler_template_card</item>
+
+    <item name="sud_glif_preference_template" type="layout">@layout/sud_glif_blank_template_card</item>
+    <item name="sud_glif_recycler_template" type="layout">@layout/sud_glif_recycler_template_card</item>
 
 </resources>
 
diff --git a/main/res/values-v27/styles.xml b/main/res/values-v27/styles.xml
index 20aa7d5..cc81ef5 100644
--- a/main/res/values-v27/styles.xml
+++ b/main/res/values-v27/styles.xml
@@ -26,6 +26,6 @@
         <item name="android:navigationBarDividerColor" tools:ignore="NewApi">@color/suw_glif_v3_nav_bar_divider_color_light</item>
         <!-- Ignore NewApi: For some reason lint seems to think this API is new in v28 (b/73514594) -->
         <item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
-        <item name="sucSystemNavBarBackgroundColor">@color/suw_glif_v3_nav_bar_color_light</item>
+        <item name="sucSystemNavBarWindowLight" tools:ignore="NewApi">?android:attr/windowLightNavigationBar</item>
     </style>
 </resources>
diff --git a/main/res/values/layouts.xml b/main/res/values/layouts.xml
index ccabf5c..cf37c37 100644
--- a/main/res/values/layouts.xml
+++ b/main/res/values/layouts.xml
@@ -17,40 +17,40 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <item name="suw_template" type="layout">@layout/suw_template_header</item>
+    <item name="sud_template" type="layout">@layout/sud_template_header</item>
 
     <!-- Ignore UnusedResources: can be used by clients -->
-    <item name="suw_template_short" type="layout" tools:ignore="UnusedResources">@layout/suw_template_header_collapsed</item>
+    <item name="sud_template_short" type="layout" tools:ignore="UnusedResources">@layout/sud_template_header_collapsed</item>
 
-    <item name="suw_list_template" type="layout">@layout/suw_list_template_header</item>
+    <item name="sud_list_template" type="layout">@layout/sud_list_template_header</item>
 
     <!-- Ignore UnusedResources: can be used by clients -->
-    <item name="suw_list_template_short" type="layout" tools:ignore="UnusedResources">@layout/suw_list_template_header_collapsed</item>
+    <item name="sud_list_template_short" type="layout" tools:ignore="UnusedResources">@layout/sud_list_template_header_collapsed</item>
 
     <!-- Ignore UnusedResources: can be used by clients -->
-    <item name="suw_no_scroll_template" type="layout" tools:ignore="UnusedResources">@layout/suw_no_scroll_template_header</item>
+    <item name="sud_no_scroll_template" type="layout" tools:ignore="UnusedResources">@layout/sud_no_scroll_template_header</item>
 
     <!-- Ignore UnusedResources: can be used by clients -->
-    <item name="suw_no_scroll_template_short" type="layout" tools:ignore="UnusedResources">@layout/suw_no_scroll_template_header_collapsed</item>
+    <item name="sud_no_scroll_template_short" type="layout" tools:ignore="UnusedResources">@layout/sud_no_scroll_template_header_collapsed</item>
 
-    <item name="suw_glif_template" type="layout">@layout/suw_glif_template_compact</item>
+    <item name="sud_glif_template" type="layout">@layout/sud_glif_template_compact</item>
 
-    <item name="suw_glif_list_template" type="layout">@layout/suw_glif_list_template_compact</item>
+    <item name="sud_glif_list_template" type="layout">@layout/sud_glif_list_template_compact</item>
 
     <!-- Ignore UnusedResources: can be used by clients -->
-    <item name="suw_glif_blank_template" type="layout" tools:ignore="UnusedResources">@layout/suw_glif_blank_template_compact</item>
+    <item name="sud_glif_blank_template" type="layout" tools:ignore="UnusedResources">@layout/sud_glif_blank_template_compact</item>
 
-    <item name="suw_preference_recycler_view" type="layout">@layout/suw_preference_recycler_view_header</item>
-    <item name="suw_preference_template" type="layout">@layout/suw_preference_template_header</item>
-    <item name="suw_recycler_template" type="layout">@layout/suw_recycler_template_header</item>
+    <item name="sud_preference_recycler_view" type="layout">@layout/sud_preference_recycler_view_header</item>
+    <item name="sud_preference_template" type="layout">@layout/sud_preference_template_header</item>
+    <item name="sud_recycler_template" type="layout">@layout/sud_recycler_template_header</item>
 
     <item
-        name="suw_recycler_template_short"
+        name="sud_recycler_template_short"
         type="layout"
-        tools:ignore="UnusedResources">@layout/suw_recycler_template_header_collapsed</item>
+        tools:ignore="UnusedResources">@layout/sud_recycler_template_header_collapsed</item>
     <!-- Ignore UnusedResources: can be used by clients -->
 
-    <item name="suw_glif_preference_template" type="layout">@layout/suw_glif_blank_template_compact</item>
-    <item name="suw_glif_recycler_template" type="layout">@layout/suw_glif_recycler_template_compact</item>
+    <item name="sud_glif_preference_template" type="layout">@layout/sud_glif_blank_template_compact</item>
+    <item name="sud_glif_recycler_template" type="layout">@layout/sud_glif_recycler_template_compact</item>
 </resources>
 
diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml
index 183e493..e257c20 100644
--- a/main/res/values/styles.xml
+++ b/main/res/values/styles.xml
@@ -127,6 +127,13 @@
         <item name="suwScrollIndicators">bottom</item>
         <item name="textAppearanceListItem">@style/TextAppearance.SuwGlifItemTitle</item>
         <item name="textAppearanceListItemSmall">@style/TextAppearance.SuwGlifItemSummary</item>
+        <item name="sucFooterBarButtonFontFamily">?attr/suwButtonFontFamily</item>
+        <item name="sucFooterBarButtonCornerRadius">?attr/suwButtonCornerRadius</item>
+        <item name="sucFooterBarButtonAllCaps">?attr/suwButtonAllCaps</item>
+        <item name="sucFooterBarButtonColorControlHighlightRipple">?attr/colorAccent</item>
+        <item name="sucFooterBarButtonHighlightAlpha">?attr/suwButtonHighlightAlpha</item>
+        <item name="sucStatusBarBackground">?android:attr/colorBackground</item>
+        <item name="sucSystemNavBarBackgroundColor">?android:attr/navigationBarColor</item>
     </style>
 
     <style name="SuwThemeGlif.Light" parent="Theme.AppCompat.Light.NoActionBar">
@@ -167,6 +174,13 @@
         <item name="suwScrollIndicators">bottom</item>
         <item name="textAppearanceListItem">@style/TextAppearance.SuwGlifItemTitle</item>
         <item name="textAppearanceListItemSmall">@style/TextAppearance.SuwGlifItemSummary</item>
+        <item name="sucFooterBarButtonFontFamily">?attr/suwButtonFontFamily</item>
+        <item name="sucFooterBarButtonCornerRadius">?attr/suwButtonCornerRadius</item>
+        <item name="sucFooterBarButtonAllCaps">?attr/suwButtonAllCaps</item>
+        <item name="sucFooterBarButtonColorControlHighlightRipple">?attr/colorAccent</item>
+        <item name="sucFooterBarButtonHighlightAlpha">?attr/suwButtonHighlightAlpha</item>
+        <item name="sucStatusBarBackground">?android:attr/colorBackground</item>
+        <item name="sucSystemNavBarBackgroundColor">?android:attr/navigationBarColor</item>
     </style>
 
     <style name="SuwThemeGlifV2" parent="SuwThemeGlif">
@@ -183,6 +197,7 @@
         <item name="suwEditTextBackgroundColor">@color/suw_glif_edit_text_bg_light_color</item> <!-- TODO: Change color -->
         <item name="android:editTextStyle">@style/SuwEditText</item>
         <item name="android:alertDialogTheme" tools:targetApi="honeycomb">@style/SuwAlertDialogTheme</item>
+        <item name="sucStatusBarWindowLight" tools:targetApi="m">?android:attr/windowLightStatusBar</item>
     </style>
 
     <style name="SuwThemeGlifV2.Light" parent="SuwThemeGlif.Light">
@@ -199,6 +214,7 @@
         <item name="suwEditTextBackgroundColor">@color/suw_glif_edit_text_bg_light_color</item>
         <item name="android:editTextStyle">@style/SuwEditText</item>
         <item name="android:alertDialogTheme" tools:targetApi="honeycomb">@style/SuwAlertDialogTheme.Light</item>
+        <item name="sucStatusBarWindowLight" tools:targetApi="m">?android:attr/windowLightStatusBar</item>
     </style>
 
     <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2">
diff --git a/main/src/com/google/android/setupdesign/GlifLayout.java b/main/src/com/google/android/setupdesign/GlifLayout.java
index 3a75d02..d3a7354 100644
--- a/main/src/com/google/android/setupdesign/GlifLayout.java
+++ b/main/src/com/google/android/setupdesign/GlifLayout.java
@@ -138,7 +138,7 @@ public class GlifLayout extends PartnerCustomizationLayout {
   @Override
   protected View onInflateTemplate(LayoutInflater inflater, @LayoutRes int template) {
     if (template == 0) {
-      template = R.layout.suw_glif_template;
+      template = R.layout.sud_glif_template;
     }
     return inflateTemplate(inflater, R.style.SuwThemeGlif_Light, template);
   }
diff --git a/main/src/com/google/android/setupdesign/GlifListLayout.java b/main/src/com/google/android/setupdesign/GlifListLayout.java
index 2232476..c5a78f3 100644
--- a/main/src/com/google/android/setupdesign/GlifListLayout.java
+++ b/main/src/com/google/android/setupdesign/GlifListLayout.java
@@ -80,7 +80,7 @@ public class GlifListLayout extends GlifLayout {
   @Override
   protected View onInflateTemplate(LayoutInflater inflater, int template) {
     if (template == 0) {
-      template = R.layout.suw_glif_list_template;
+      template = R.layout.sud_glif_list_template;
     }
     return super.onInflateTemplate(inflater, template);
   }
diff --git a/main/src/com/google/android/setupdesign/GlifPreferenceLayout.java b/main/src/com/google/android/setupdesign/GlifPreferenceLayout.java
index 5121e86..5947644 100644
--- a/main/src/com/google/android/setupdesign/GlifPreferenceLayout.java
+++ b/main/src/com/google/android/setupdesign/GlifPreferenceLayout.java
@@ -98,7 +98,7 @@ public class GlifPreferenceLayout extends GlifRecyclerLayout {
   @Override
   protected View onInflateTemplate(LayoutInflater inflater, int template) {
     if (template == 0) {
-      template = R.layout.suw_glif_preference_template;
+      template = R.layout.sud_glif_preference_template;
     }
     return super.onInflateTemplate(inflater, template);
   }
@@ -109,7 +109,7 @@ public class GlifPreferenceLayout extends GlifRecyclerLayout {
     // immediately.
     final LayoutInflater inflater = LayoutInflater.from(getContext());
     RecyclerView recyclerView =
-        (RecyclerView) inflater.inflate(R.layout.suw_glif_preference_recycler_view, this, false);
+        (RecyclerView) inflater.inflate(R.layout.sud_glif_preference_recycler_view, this, false);
     recyclerMixin = new RecyclerMixin(this, recyclerView);
   }
 }
diff --git a/main/src/com/google/android/setupdesign/GlifRecyclerLayout.java b/main/src/com/google/android/setupdesign/GlifRecyclerLayout.java
index ac7d7e5..c62ac85 100644
--- a/main/src/com/google/android/setupdesign/GlifRecyclerLayout.java
+++ b/main/src/com/google/android/setupdesign/GlifRecyclerLayout.java
@@ -81,7 +81,7 @@ public class GlifRecyclerLayout extends GlifLayout {
   @Override
   protected View onInflateTemplate(LayoutInflater inflater, int template) {
     if (template == 0) {
-      template = R.layout.suw_glif_recycler_template;
+      template = R.layout.sud_glif_recycler_template;
     }
     return super.onInflateTemplate(inflater, template);
   }
diff --git a/main/src/com/google/android/setupdesign/SetupWizardLayout.java b/main/src/com/google/android/setupdesign/SetupWizardLayout.java
index 608646a..a90b839 100644
--- a/main/src/com/google/android/setupdesign/SetupWizardLayout.java
+++ b/main/src/com/google/android/setupdesign/SetupWizardLayout.java
@@ -168,7 +168,7 @@ public class SetupWizardLayout extends TemplateLayout {
   @Override
   protected View onInflateTemplate(LayoutInflater inflater, int template) {
     if (template == 0) {
-      template = R.layout.suw_template;
+      template = R.layout.sud_template;
     }
     return inflateTemplate(inflater, R.style.SuwThemeMaterial_Light, template);
   }
diff --git a/main/src/com/google/android/setupdesign/SetupWizardListLayout.java b/main/src/com/google/android/setupdesign/SetupWizardListLayout.java
index 38358d9..ad05735 100644
--- a/main/src/com/google/android/setupdesign/SetupWizardListLayout.java
+++ b/main/src/com/google/android/setupdesign/SetupWizardListLayout.java
@@ -70,7 +70,7 @@ public class SetupWizardListLayout extends SetupWizardLayout {
   @Override
   protected View onInflateTemplate(LayoutInflater inflater, int template) {
     if (template == 0) {
-      template = R.layout.suw_list_template;
+      template = R.layout.sud_list_template;
     }
     return super.onInflateTemplate(inflater, template);
   }
diff --git a/main/src/com/google/android/setupdesign/SetupWizardPreferenceLayout.java b/main/src/com/google/android/setupdesign/SetupWizardPreferenceLayout.java
index e4d38c6..fe6c5a2 100644
--- a/main/src/com/google/android/setupdesign/SetupWizardPreferenceLayout.java
+++ b/main/src/com/google/android/setupdesign/SetupWizardPreferenceLayout.java
@@ -97,7 +97,7 @@ public class SetupWizardPreferenceLayout extends SetupWizardRecyclerLayout {
   @Override
   protected View onInflateTemplate(LayoutInflater inflater, int template) {
     if (template == 0) {
-      template = R.layout.suw_preference_template;
+      template = R.layout.sud_preference_template;
     }
     return super.onInflateTemplate(inflater, template);
   }
@@ -108,7 +108,7 @@ public class SetupWizardPreferenceLayout extends SetupWizardRecyclerLayout {
     // immediately.
     final LayoutInflater inflater = LayoutInflater.from(getContext());
     RecyclerView recyclerView =
-        (RecyclerView) inflater.inflate(R.layout.suw_preference_recycler_view, this, false);
+        (RecyclerView) inflater.inflate(R.layout.sud_preference_recycler_view, this, false);
     recyclerMixin = new RecyclerMixin(this, recyclerView);
   }
 }
diff --git a/main/src/com/google/android/setupdesign/SetupWizardRecyclerLayout.java b/main/src/com/google/android/setupdesign/SetupWizardRecyclerLayout.java
index 4313123..7808c4c 100644
--- a/main/src/com/google/android/setupdesign/SetupWizardRecyclerLayout.java
+++ b/main/src/com/google/android/setupdesign/SetupWizardRecyclerLayout.java
@@ -100,7 +100,7 @@ public class SetupWizardRecyclerLayout extends SetupWizardLayout {
   @Override
   protected View onInflateTemplate(LayoutInflater inflater, int template) {
     if (template == 0) {
-      template = R.layout.suw_recycler_template;
+      template = R.layout.sud_recycler_template;
     }
     return super.onInflateTemplate(inflater, template);
   }
diff --git a/main/src/com/google/android/setupdesign/gesture/ConsecutiveTapsGestureDetector.java b/main/src/com/google/android/setupdesign/gesture/ConsecutiveTapsGestureDetector.java
index 7ecae0e..c14e6de 100644
--- a/main/src/com/google/android/setupdesign/gesture/ConsecutiveTapsGestureDetector.java
+++ b/main/src/com/google/android/setupdesign/gesture/ConsecutiveTapsGestureDetector.java
@@ -47,11 +47,21 @@ public final class ConsecutiveTapsGestureDetector {
    * @param view The target view that associated with consecutive-tap gesture.
    */
   public ConsecutiveTapsGestureDetector(OnConsecutiveTapsListener listener, View view) {
+    this(listener, view, ViewConfiguration.getDoubleTapTimeout());
+  }
+
+  /**
+   * @param listener The listener that responds to the gesture.
+   * @param view The target view that associated with consecutive-tap gesture.
+   * @param consecutiveTapTimeout Maximum time in millis between two consecutive taps.
+   */
+  public ConsecutiveTapsGestureDetector(
+      OnConsecutiveTapsListener listener, View view, int consecutiveTapTimeout) {
     this.listener = listener;
     this.view = view;
+    this.consecutiveTapTimeout = consecutiveTapTimeout;
     int doubleTapSlop = ViewConfiguration.get(this.view.getContext()).getScaledDoubleTapSlop();
     consecutiveTapTouchSlopSquare = doubleTapSlop * doubleTapSlop;
-    consecutiveTapTimeout = ViewConfiguration.getDoubleTapTimeout();
   }
 
   /**
diff --git a/main/src/com/google/android/setupdesign/items/ButtonBarItem.java b/main/src/com/google/android/setupdesign/items/ButtonBarItem.java
index f6b3f89..77d06d0 100644
--- a/main/src/com/google/android/setupdesign/items/ButtonBarItem.java
+++ b/main/src/com/google/android/setupdesign/items/ButtonBarItem.java
@@ -71,7 +71,7 @@ public class ButtonBarItem extends AbstractItem implements ItemInflater.ItemPare
 
   @Override
   public int getLayoutResource() {
-    return R.layout.suw_items_button_bar;
+    return R.layout.sud_items_button_bar;
   }
 
   public void setVisible(boolean visible) {
diff --git a/main/src/com/google/android/setupdesign/items/ButtonItem.java b/main/src/com/google/android/setupdesign/items/ButtonItem.java
index a205d7a..ffefbcf 100644
--- a/main/src/com/google/android/setupdesign/items/ButtonItem.java
+++ b/main/src/com/google/android/setupdesign/items/ButtonItem.java
@@ -143,7 +143,7 @@ public class ButtonItem extends AbstractItem implements View.OnClickListener {
   private Button createButton(Context context) {
     // Inflate a single button from XML, so that when using support lib, it will take advantage
     // of the injected layout inflater and give us AppCompatButton instead.
-    return (Button) LayoutInflater.from(context).inflate(R.layout.suw_button, null, false);
+    return (Button) LayoutInflater.from(context).inflate(R.layout.sud_button, null, false);
   }
 
   @Override
diff --git a/main/src/com/google/android/setupdesign/items/ExpandableSwitchItem.java b/main/src/com/google/android/setupdesign/items/ExpandableSwitchItem.java
index ff9ae1f..1e23ff7 100644
--- a/main/src/com/google/android/setupdesign/items/ExpandableSwitchItem.java
+++ b/main/src/com/google/android/setupdesign/items/ExpandableSwitchItem.java
@@ -62,7 +62,7 @@ public class ExpandableSwitchItem extends SwitchItem
 
   @Override
   protected int getDefaultLayoutResource() {
-    return R.layout.suw_items_expandable_switch;
+    return R.layout.sud_items_expandable_switch;
   }
 
   @Override
@@ -120,7 +120,7 @@ public class ExpandableSwitchItem extends SwitchItem
   public void onBindView(View view) {
     // TODO: If it is possible to detect, log a warning if this is being used with ListView.
     super.onBindView(view);
-    View content = view.findViewById(R.id.suw_items_expandable_switch_content);
+    View content = view.findViewById(R.id.sud_items_expandable_switch_content);
     content.setOnClickListener(this);
 
     if (content instanceof CheckableLinearLayout) {
diff --git a/main/src/com/google/android/setupdesign/items/Item.java b/main/src/com/google/android/setupdesign/items/Item.java
index b5c99b0..fac23fb 100644
--- a/main/src/com/google/android/setupdesign/items/Item.java
+++ b/main/src/com/google/android/setupdesign/items/Item.java
@@ -56,7 +56,7 @@ public class Item extends AbstractItem {
   }
 
   protected int getDefaultLayoutResource() {
-    return R.layout.suw_items_default;
+    return R.layout.sud_items_default;
   }
 
   public void setEnabled(boolean enabled) {
diff --git a/main/src/com/google/android/setupdesign/items/SwitchItem.java b/main/src/com/google/android/setupdesign/items/SwitchItem.java
index 7174c0d..940acea 100644
--- a/main/src/com/google/android/setupdesign/items/SwitchItem.java
+++ b/main/src/com/google/android/setupdesign/items/SwitchItem.java
@@ -82,7 +82,7 @@ public class SwitchItem extends Item implements CompoundButton.OnCheckedChangeLi
 
   @Override
   protected int getDefaultLayoutResource() {
-    return R.layout.suw_items_switch;
+    return R.layout.sud_items_switch;
   }
 
   /**
@@ -92,14 +92,14 @@ public class SwitchItem extends Item implements CompoundButton.OnCheckedChangeLi
    */
   public void toggle(View view) {
     checked = !checked;
-    final SwitchCompat switchView = (SwitchCompat) view.findViewById(R.id.suw_items_switch);
+    final SwitchCompat switchView = (SwitchCompat) view.findViewById(R.id.sud_items_switch);
     switchView.setChecked(checked);
   }
 
   @Override
   public void onBindView(View view) {
     super.onBindView(view);
-    final SwitchCompat switchView = (SwitchCompat) view.findViewById(R.id.suw_items_switch);
+    final SwitchCompat switchView = (SwitchCompat) view.findViewById(R.id.sud_items_switch);
     switchView.setOnCheckedChangeListener(null);
     switchView.setChecked(checked);
     switchView.setOnCheckedChangeListener(this);
diff --git a/main/src/com/google/android/setupdesign/view/NavigationBar.java b/main/src/com/google/android/setupdesign/view/NavigationBar.java
index 9e89ed0..ac0f8c8 100644
--- a/main/src/com/google/android/setupdesign/view/NavigationBar.java
+++ b/main/src/com/google/android/setupdesign/view/NavigationBar.java
@@ -103,7 +103,7 @@ public class NavigationBar extends LinearLayout implements View.OnClickListener
   // All the constructors delegate to this init method. The 3-argument constructor is not
   // available in LinearLayout before v11, so call super with the exact same arguments.
   private void init() {
-    View.inflate(getContext(), R.layout.suw_navbar_view, this);
+    View.inflate(getContext(), R.layout.sud_navbar_view, this);
     nextButton = (Button) findViewById(R.id.suw_navbar_next);
     backButton = (Button) findViewById(R.id.suw_navbar_back);
     moreButton = (Button) findViewById(R.id.suw_navbar_more);