Merge "[SetupWizardLib] Resources for ICS" into ub-setupwizard-alatar

library/res-ics/drawable-ldrtl/suw_navbar_ic_back_dark.xml

@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/suw_navbar_ic_right_arrow_dark" />

library/res-ics/drawable-ldrtl/suw_navbar_ic_back_light.xml

@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/suw_navbar_ic_right_arrow_light" />

library/res-ics/drawable-ldrtl/suw_navbar_ic_next_dark.xml

@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/suw_navbar_ic_left_arrow_dark" />

library/res-ics/drawable-ldrtl/suw_navbar_ic_next_light.xml

@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/suw_navbar_ic_left_arrow_light" />

library/res-ics/drawable/suw_card_bg_dark.xml

@@ -0,0 +1,27 @@
+<?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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:topLeftRadius="@dimen/suw_card_corner_radius"
+        android:topRightRadius="@dimen/suw_card_corner_radius" />
+
+    <solid android:color="@color/background_material_dark" />
+
+</shape>

library/res-ics/drawable/suw_card_bg_light.xml

@@ -0,0 +1,27 @@
+<?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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:topLeftRadius="@dimen/suw_card_corner_radius"
+        android:topRightRadius="@dimen/suw_card_corner_radius" />
+
+    <solid android:color="@color/background_material_light" />
+
+</shape>

library/res-ics/drawable/suw_navbar_btn_bg_dark.xml

@@ -0,0 +1,28 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true">
+        <color android:color="@color/ripple_material_dark" />
+    </item>
+
+    <item>
+        <color android:color="@android:color/transparent" />
+    </item>
+
+</selector>

library/res-ics/drawable/suw_navbar_btn_bg_light.xml

@@ -0,0 +1,28 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true">
+        <color android:color="@color/ripple_material_light" />
+    </item>
+
+    <item>
+        <color android:color="@android:color/transparent" />
+    </item>
+
+</selector>

library/res-ics/drawable/suw_navbar_ic_back_dark.xml

@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/suw_navbar_ic_left_arrow_dark" />

library/res-ics/drawable/suw_navbar_ic_back_light.xml

@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/suw_navbar_ic_left_arrow_light" />

library/res-ics/drawable/suw_navbar_ic_next_dark.xml

@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/suw_navbar_ic_right_arrow_dark" />

library/res-ics/drawable/suw_navbar_ic_next_light.xml

@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/suw_navbar_ic_right_arrow_light" />

library/res-ics/values/styles.xml

@@ -15,5 +15,79 @@
     limitations under the License.
 -->
 
-<resources>
-</resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- General styles -->
+
+    <style name="SuwThemeMaterial" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:textColorLink">@color/suw_link_color_dark</item>
+        <item name="android:textColorSecondary">@color/suw_color_secondary_dark</item>
+        <item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
+        <item name="android:windowSoftInputMode">adjustPan</item>
+
+        <item name="colorAccent">@color/suw_color_accent_dark</item>
+        <item name="suwCardBackground">@drawable/suw_card_bg_dark</item>
+        <item name="suwNavBarTheme">@style/SuwNavBarThemeDark</item>
+    </style>
+
+    <style name="SuwThemeMaterial.Light" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:textColorLink">@color/suw_link_color_light</item>
+        <item name="android:textColorSecondary">@color/suw_color_secondary_light</item>
+        <item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
+        <item name="android:windowSoftInputMode">adjustPan</item>
+
+        <item name="colorAccent">@color/suw_color_accent_light</item>
+        <item name="suwCardBackground">@drawable/suw_card_bg_light</item>
+        <item name="suwNavBarTheme">@style/SuwNavBarThemeLight</item>
+    </style>
+
+    <!-- Content styles -->
+
+    <style name="SuwDescription">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">@dimen/suw_description_margin_bottom</item>
+        <item name="android:layout_marginTop">@dimen/suw_description_margin_top</item>
+        <item name="android:lineSpacingExtra">@dimen/suw_description_line_spacing_extra</item>
+        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Medium</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textSize">@dimen/suw_description_text_size</item>
+    </style>
+
+    <!-- Card layout (for tablets) -->
+
+    <style name="TextAppearance.SuwCardTitle" parent="@style/TextAppearance.AppCompat.Display1">
+        <item name="android:textColor">@android:color/white</item>
+    </style>
+
+    <!-- Navigation bar styles -->
+
+    <style name="SuwNavBarButtonStyle" parent="@android:style/Widget.Holo.Button.Borderless">
+        <item name="android:background">?attr/suwNavBarButtonBackground</item>
+        <item name="android:drawablePadding">@dimen/suw_navbar_button_drawable_padding</item>
+        <item name="android:fontFamily" tools:ignore="NewApi">sans-serif</item>
+        <item name="android:minWidth">0dp</item>
+        <item name="android:paddingLeft">@dimen/suw_navbar_button_padding_sides</item>
+        <item name="android:paddingRight">@dimen/suw_navbar_button_padding_sides</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">?attr/suwNavBarTextColor</item>
+        <item name="android:textSize">@dimen/suw_navbar_text_size</item>
+    </style>
+
+    <style name="SuwNavBarThemeDark" parent="SuwNavBarTheme">
+        <item name="suwNavBarBackButton">@drawable/suw_navbar_ic_back_dark</item>
+        <item name="suwNavBarBackgroundColor">@color/suw_navbar_bg_dark</item>
+        <item name="suwNavBarButtonBackground">@drawable/suw_navbar_btn_bg_dark</item>
+        <item name="suwNavBarNextButton">@drawable/suw_navbar_ic_next_dark</item>
+        <item name="suwNavBarTextColor">@color/suw_navbar_text_dark</item>
+    </style>
+
+    <style name="SuwNavBarThemeLight" parent="SuwNavBarTheme">
+        <item name="suwNavBarBackButton">@drawable/suw_navbar_ic_back_light</item>
+        <item name="suwNavBarBackgroundColor">@color/suw_navbar_bg_light</item>
+        <item name="suwNavBarButtonBackground">@drawable/suw_navbar_btn_bg_light</item>
+        <item name="suwNavBarNextButton">@drawable/suw_navbar_ic_next_light</item>
+        <item name="suwNavBarTextColor">@color/suw_navbar_text_light</item>
+    </style>
+
+</resources>

library/res/drawable/suw_layout_background.xml

@@ -19,6 +19,6 @@
      with a suitable tileable background. -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid android:color="?android:attr/colorAccent" />
+    <solid android:color="@color/suw_color_accent_light" />
 
 </shape>

library/res/layout/suw_list_header.xml

@@ -18,13 +18,15 @@
 <com.android.setupwizardlib.view.Illustration
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/suw_layout_decor"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/suw_layout_background"
     android:elevation="@dimen/suw_title_area_elevation"
     android:tag="stickyContainer"
-    app:suwAspectRatio="2.22">
+    app:suwAspectRatio="2.22"
+    tools:ignore="UnusedAttribute">
 
     <TextView
         android:id="@+id/suw_layout_title"

library/res/layout/suw_list_template_card.xml

@@ -16,6 +16,7 @@
 -->
 
 <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">
@@ -46,8 +47,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
-                android:background="@drawable/suw_card_bg"
-                android:elevation="@dimen/suw_card_elevation" />
+                android:background="?attr/suwCardBackground"
+                android:elevation="@dimen/suw_card_elevation"
+                tools:ignore="UnusedAttribute" />
 
         </LinearLayout>
 

library/res/layout/suw_list_template_card_wide.xml

@@ -16,6 +16,7 @@
 -->
 
 <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">
@@ -47,8 +48,9 @@
                 android:layout_height="match_parent"
                 android:layout_marginTop="@dimen/suw_card_land_margin_top"
                 android:layout_weight="8"
-                android:background="@drawable/suw_card_bg"
-                android:elevation="@dimen/suw_card_elevation" />
+                android:background="?attr/suwCardBackground"
+                android:elevation="@dimen/suw_card_elevation"
+                tools:ignore="UnusedAttribute" />
 
         </LinearLayout>
 

library/res/layout/suw_list_template_header_collapsed.xml

@@ -16,6 +16,7 @@
 -->
 
 <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">
@@ -25,7 +26,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/suw_layout_background"
-        android:elevation="@dimen/suw_title_area_elevation">
+        android:elevation="@dimen/suw_title_area_elevation"
+        tools:ignore="UnusedAttribute">
 
         <TextView
             android:id="@+id/suw_layout_title"

library/res/layout/suw_navbar_view.xml

@@ -23,7 +23,8 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:contentDescription="@string/suw_back_button_label"
-        android:drawableStart="@drawable/suw_navbar_ic_back" />
+        android:drawableLeft="?attr/suwNavBarBackButton"
+        android:drawableStart="?attr/suwNavBarBackButton" />
 
     <Space
         android:layout_width="0dp"
@@ -35,7 +36,8 @@
         style="@style/SuwNavBarButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:drawableEnd="@drawable/suw_navbar_ic_next"
+        android:drawableEnd="?attr/suwNavBarNextButton"
+        android:drawableRight="?attr/suwNavBarNextButton"
         android:gravity="end|center_vertical"
         android:text="@string/suw_next_button_label" />
 

library/res/layout/suw_template_card.xml

@@ -16,6 +16,7 @@
 -->
 
 <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">
@@ -46,9 +47,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
-                android:background="@drawable/suw_card_bg"
+                android:background="?attr/suwCardBackground"
                 android:elevation="@dimen/suw_card_elevation"
-                android:fillViewport="true">
+                android:fillViewport="true"
+                tools:ignore="UnusedAttribute">
 
                 <FrameLayout
                     android:id="@+id/suw_layout_content"

library/res/layout/suw_template_card_wide.xml

@@ -16,6 +16,7 @@
 -->
 
 <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">
@@ -47,9 +48,10 @@
                 android:layout_height="match_parent"
                 android:layout_marginTop="@dimen/suw_card_land_margin_top"
                 android:layout_weight="8"
-                android:background="@drawable/suw_card_bg"
+                android:background="?attr/suwCardBackground"
                 android:elevation="@dimen/suw_card_elevation"
-                android:fillViewport="true">
+                android:fillViewport="true"
+                tools:ignore="UnusedAttribute">
 
                 <FrameLayout android:id="@+id/suw_layout_content"
                     android:layout_width="match_parent"

library/res/layout/suw_template_header.xml

@@ -17,6 +17,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -40,7 +41,8 @@
                 android:background="@drawable/suw_layout_background"
                 android:elevation="@dimen/suw_title_area_elevation"
                 android:tag="stickyContainer"
-                app:suwAspectRatio="2.22">
+                app:suwAspectRatio="2.22"
+                tools:ignore="UnusedAttribute">
 
                 <TextView
                     android:id="@+id/suw_layout_title"

library/res/layout/suw_template_header_collapsed.xml

@@ -16,6 +16,7 @@
 -->
 
 <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">
@@ -25,7 +26,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/suw_layout_background"
-        android:elevation="@dimen/suw_title_area_elevation">
+        android:elevation="@dimen/suw_title_area_elevation"
+        tools:ignore="UnusedAttribute">
 
         <TextView
             android:id="@+id/suw_layout_title"

library/res/values-v21/styles.xml

@@ -27,6 +27,9 @@
         <item name="android:textColorSecondary">@color/suw_color_secondary_dark</item>
         <item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
         <item name="android:windowSoftInputMode">adjustPan</item>
+
+        <item name="suwCardBackground">@drawable/suw_card_bg</item>
+        <item name="suwNavBarTheme">@style/SuwNavBarThemeDark</item>
     </style>
 
     <style name="SuwThemeMaterial.Light" parent="android:Theme.Material.Light.NoActionBar">
@@ -37,24 +40,13 @@
         <item name="android:textColorSecondary">@color/suw_color_secondary_light</item>
         <item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
         <item name="android:windowSoftInputMode">adjustPan</item>
-    </style>
 
-    <style name="Animation.SuwWindowAnimation" parent="@android:style/Animation.Activity">
-        <item name="android:activityOpenEnterAnimation">@anim/suw_slide_next_in</item>
-        <item name="android:activityOpenExitAnimation">@anim/suw_slide_next_out</item>
-        <item name="android:activityCloseEnterAnimation">@anim/suw_slide_back_in</item>
-        <item name="android:activityCloseExitAnimation">@anim/suw_slide_back_out</item>
+        <item name="suwCardBackground">@drawable/suw_card_bg</item>
+        <item name="suwNavBarTheme">@style/SuwNavBarThemeLight</item>
     </style>
 
     <!-- Content styles -->
 
-    <style name="SuwContentFrame">
-        <item name="android:paddingTop">@dimen/suw_content_frame_padding_top</item>
-        <item name="android:paddingLeft">@dimen/suw_layout_margin_sides</item>
-        <item name="android:paddingRight">@dimen/suw_layout_margin_sides</item>
-        <item name="android:paddingBottom">@dimen/suw_content_frame_padding_bottom</item>
-    </style>
-
     <style name="SuwDescription">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -68,65 +60,38 @@
 
     <!-- Card layout (for tablets) -->
 
-    <style name="SuwCardTitle">
-        <item name="android:paddingBottom">@dimen/suw_card_title_padding_bottom</item>
-        <item name="android:paddingEnd">@dimen/suw_card_title_padding_end</item>
-        <item name="android:paddingStart">@dimen/suw_card_title_padding_start</item>
-        <item name="android:paddingTop">@dimen/suw_card_title_padding_top</item>
-        <item name="android:textAppearance">@style/TextAppearance.SuwCardTitle</item>
-    </style>
-
     <style name="TextAppearance.SuwCardTitle" parent="@android:style/TextAppearance.Material.Display1">
         <item name="android:textColor">@android:color/white</item>
     </style>
 
-    <!-- Header layout (for phones) -->
-
-    <style name="SuwHeaderTitle">
-        <item name="android:layout_marginBottom">@dimen/suw_header_title_margin_bottom</item>
-        <item name="android:layout_marginEnd">@dimen/suw_layout_margin_sides</item>
-        <item name="android:layout_marginStart">@dimen/suw_layout_margin_sides</item>
-        <item name="android:lineSpacingExtra">@dimen/suw_header_title_line_spacing_extra</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>
-
     <!-- Navigation bar styles -->
 
-    <style name="SuwNavBarThemeDark">
-        <item name="suwNavBarBackgroundColor">@color/suw_navbar_bg_dark</item>
-        <item name="suwNavBarTextColor">@color/suw_navbar_text_dark</item>
-    </style>
-
-    <style name="SuwNavBarThemeLight">
-        <item name="suwNavBarBackgroundColor">@color/suw_navbar_bg_light</item>
-        <item name="suwNavBarTextColor">@color/suw_navbar_text_light</item>
-    </style>
-
     <style name="SuwNavBarButtonStyle" parent="@android:style/Widget.Material.Button.Borderless">
-        <item name="android:background">@drawable/suw_navbar_btn_bg</item>
+        <item name="android:background">?attr/suwNavBarButtonBackground</item>
         <item name="android:drawablePadding">@dimen/suw_navbar_button_drawable_padding</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:minWidth">0dp</item>
-        <item name="android:paddingEnd">@dimen/suw_navbar_button_padding_sides</item>
-        <item name="android:paddingStart">@dimen/suw_navbar_button_padding_sides</item>
+        <item name="android:paddingLeft">@dimen/suw_navbar_button_padding_sides</item>
+        <item name="android:paddingRight">@dimen/suw_navbar_button_padding_sides</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:textColor">?attr/suwNavBarTextColor</item>
         <item name="android:textSize">@dimen/suw_navbar_text_size</item>
     </style>
 
-    <style name="SuwNavBarStyle">
-        <item name="android:orientation">horizontal</item>
-        <!-- TODO: Remove layout_width and layout_height from style. It will crash the app if we
-             switch to a different style without those specified -->
-        <item name="android:layout_height">@dimen/suw_navbar_height</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_alignParentBottom">true</item>
-        <item name="android:background">?attr/suwNavBarBackgroundColor</item>
-        <item name="android:paddingStart">@dimen/suw_navbar_padding_sides</item>
-        <item name="android:paddingEnd">@dimen/suw_navbar_padding_sides</item>
+    <style name="SuwNavBarThemeDark" parent="SuwNavBarTheme">
+        <item name="suwNavBarBackButton">@drawable/suw_navbar_ic_back</item>
+        <item name="suwNavBarBackgroundColor">@color/suw_navbar_bg_dark</item>
+        <item name="suwNavBarButtonBackground">@drawable/suw_navbar_btn_bg</item>
+        <item name="suwNavBarNextButton">@drawable/suw_navbar_ic_next</item>
+        <item name="suwNavBarTextColor">@color/suw_navbar_text_dark</item>
+    </style>
+
+    <style name="SuwNavBarThemeLight" parent="SuwNavBarTheme">
+        <item name="suwNavBarBackButton">@drawable/suw_navbar_ic_back</item>
+        <item name="suwNavBarBackgroundColor">@color/suw_navbar_bg_light</item>
+        <item name="suwNavBarButtonBackground">@drawable/suw_navbar_btn_bg</item>
+        <item name="suwNavBarNextButton">@drawable/suw_navbar_ic_next</item>
+        <item name="suwNavBarTextColor">@color/suw_navbar_text_light</item>
     </style>
 
 </resources>

library/res/values/attrs.xml

@@ -19,7 +19,11 @@
 
     <attr name="suwLayoutTheme" format="reference" />
 
+    <attr name="suwCardBackground" format="color|reference" />
+    <attr name="suwNavBarBackButton" format="reference" />
     <attr name="suwNavBarBackgroundColor" format="color" />
+    <attr name="suwNavBarButtonBackground" format="color|reference" />
+    <attr name="suwNavBarNextButton" format="reference" />
     <attr name="suwNavBarTextColor" format="color" />
     <attr name="suwNavBarTheme" format="reference" />
 

library/res/values/styles.xml

@@ -0,0 +1,73 @@
+<?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.
+-->
+
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- General styles -->
+
+    <style name="Animation.SuwWindowAnimation" parent="@android:style/Animation.Activity">
+        <item name="android:activityOpenEnterAnimation">@anim/suw_slide_next_in</item>
+        <item name="android:activityOpenExitAnimation">@anim/suw_slide_next_out</item>
+        <item name="android:activityCloseEnterAnimation">@anim/suw_slide_back_in</item>
+        <item name="android:activityCloseExitAnimation">@anim/suw_slide_back_out</item>
+    </style>
+
+    <!-- Content styles -->
+
+    <style name="SuwContentFrame">
+        <item name="android:paddingTop">@dimen/suw_content_frame_padding_top</item>
+        <item name="android:paddingLeft">@dimen/suw_layout_margin_sides</item>
+        <item name="android:paddingRight">@dimen/suw_layout_margin_sides</item>
+        <item name="android:paddingBottom">@dimen/suw_content_frame_padding_bottom</item>
+    </style>
+
+    <!-- Card layout (for tablets) -->
+
+    <style name="SuwCardTitle">
+        <item name="android:paddingBottom">@dimen/suw_card_title_padding_bottom</item>
+        <item name="android:paddingEnd" tools:ignore="NewApi">@dimen/suw_card_title_padding_end</item>
+        <item name="android:paddingLeft">@dimen/suw_card_title_padding_start</item>
+        <item name="android:paddingRight">@dimen/suw_card_title_padding_end</item>
+        <item name="android:paddingStart" tools:ignore="NewApi">@dimen/suw_card_title_padding_start</item>
+        <item name="android:paddingTop">@dimen/suw_card_title_padding_top</item>
+        <item name="android:textAppearance">@style/TextAppearance.SuwCardTitle</item>
+    </style>
+
+    <!-- Header layout (for phones) -->
+
+    <style name="SuwHeaderTitle">
+        <item name="android:layout_marginBottom">@dimen/suw_header_title_margin_bottom</item>
+        <item name="android:layout_marginLeft">@dimen/suw_layout_margin_sides</item>
+        <item name="android:layout_marginRight">@dimen/suw_layout_margin_sides</item>
+        <item name="android:lineSpacingExtra">@dimen/suw_header_title_line_spacing_extra</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>
+
+    <!-- Navigation bar styles -->
+
+    <style name="SuwNavBarTheme">
+        <item name="android:orientation">horizontal</item>
+        <item name="android:layout_alignParentBottom">true</item>
+        <item name="android:background">?attr/suwNavBarBackgroundColor</item>
+        <item name="android:paddingLeft">@dimen/suw_navbar_padding_sides</item>
+        <item name="android:paddingRight">@dimen/suw_navbar_padding_sides</item>
+    </style>
+
+</resources>