Add finish action to setup wizard
Bug: 8159728
Change-Id: I1578fc31875a1edbfea213fb5e1a1b464d02e941
diff --git a/java/res/drawable/setup_step_action_color.xml b/java/res/color/setup_step_action_color.xml
similarity index 100%
rename from java/res/drawable/setup_step_action_color.xml
rename to java/res/color/setup_step_action_color.xml
diff --git a/java/res/drawable/ic_setup_step3_finish.xml b/java/res/drawable/ic_setup_finish.xml
similarity index 100%
rename from java/res/drawable/ic_setup_step3_finish.xml
rename to java/res/drawable/ic_setup_finish.xml
diff --git a/java/res/layout/setup_wizard.xml b/java/res/layout/setup_wizard.xml
index a922fda..0ee24c2 100644
--- a/java/res/layout/setup_wizard.xml
+++ b/java/res/layout/setup_wizard.xml
@@ -57,6 +57,7 @@
android:layout_height="24dp"
android:layout_below="@id/setup_step_bullets" />
<FrameLayout
+ android:id="@+id/setup_steps_pane"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/setup_step_indicator">
@@ -70,4 +71,10 @@
android:id="@+id/setup_step3"
layout="@layout/setup_step" />
</FrameLayout>
+ <TextView
+ android:id="@+id/setup_finish"
+ android:text="@string/setup_finish_action"
+ style="@style/setupStepActionLabelStyle"
+ android:layout_below="@id/setup_steps_pane"
+ android:layout_marginTop="2dp" />
</RelativeLayout>
diff --git a/java/res/values/setup-styles-common.xml b/java/res/values/setup-styles-common.xml
index 59a768a..4e4e4a5 100644
--- a/java/res/values/setup-styles-common.xml
+++ b/java/res/values/setup-styles-common.xml
@@ -44,7 +44,7 @@
<item name="android:textSize">14sp</item>
</style>
<style name="setupStepActionLabelStyleCommon" parent="setupStepBaseStyle">
- <item name="android:textColor">@drawable/setup_step_action_color</item>
+ <item name="android:textColor">@color/setup_step_action_color</item>
<item name="android:background">@drawable/setup_step_action_background</item>
<item name="android:layout_height">48dp</item>
<item name="android:paddingLeft">12dp</item>