From 192743a6aea378163d4ad47037ee16509b1d7b2a Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Thu, 18 Apr 2013 15:11:33 +0900 Subject: [PATCH] Add finish action to setup wizard Bug: 8159728 Change-Id: I1578fc31875a1edbfea213fb5e1a1b464d02e941 --- .../setup_step_action_color.xml | 0 ...p_step3_finish.xml => ic_setup_finish.xml} | 0 java/res/layout/setup_wizard.xml | 7 ++++++ java/res/values/setup-styles-common.xml | 2 +- .../latin/setup/SetupActivity.java | 24 +++++++++++++++---- 5 files changed, 28 insertions(+), 5 deletions(-) rename java/res/{drawable => color}/setup_step_action_color.xml (100%) rename java/res/drawable/{ic_setup_step3_finish.xml => ic_setup_finish.xml} (100%) 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 a922fdab8..0ee24c282 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" /> @@ -70,4 +71,10 @@ android:id="@+id/setup_step3" layout="@layout/setup_step" /> + diff --git a/java/res/values/setup-styles-common.xml b/java/res/values/setup-styles-common.xml index 59a768a63..4e4e4a5a3 100644 --- a/java/res/values/setup-styles-common.xml +++ b/java/res/values/setup-styles-common.xml @@ -44,7 +44,7 @@ 14sp