diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-04-19 10:58:54 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-04-19 10:58:55 +0000 |
| commit | 16ec2e1155a0152c6ded42bc8941b90b7cd08d35 (patch) | |
| tree | 29bce356069f4d4998fefb8991bbcc7ced9078fa /java/res | |
| parent | ff078041e7829e1a0d4537c395dad0cf9c4d7f51 (diff) | |
| parent | 192743a6aea378163d4ad47037ee16509b1d7b2a (diff) | |
| download | latinime-16ec2e1155a0152c6ded42bc8941b90b7cd08d35.tar.gz latinime-16ec2e1155a0152c6ded42bc8941b90b7cd08d35.tar.xz latinime-16ec2e1155a0152c6ded42bc8941b90b7cd08d35.zip | |
Merge "Add finish action to setup wizard"
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/color/setup_step_action_color.xml (renamed from java/res/drawable/setup_step_action_color.xml) | 0 | ||||
| -rw-r--r-- | java/res/drawable/ic_setup_finish.xml (renamed from java/res/drawable/ic_setup_step3_finish.xml) | 0 | ||||
| -rw-r--r-- | java/res/layout/setup_wizard.xml | 7 | ||||
| -rw-r--r-- | java/res/values/setup-styles-common.xml | 2 |
4 files changed, 8 insertions, 1 deletions
diff --git a/java/res/drawable/setup_step_action_color.xml b/java/res/color/setup_step_action_color.xml index c53e026d5..c53e026d5 100644 --- a/java/res/drawable/setup_step_action_color.xml +++ b/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 index 8ac8a86d1..8ac8a86d1 100644 --- a/java/res/drawable/ic_setup_step3_finish.xml +++ b/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" /> <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 59a768a63..4e4e4a5a3 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> |