diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-05-15 10:52:40 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-05-15 10:52:40 -0700 |
| commit | 680fa7ba77d65b0aaaea90cff8892b687052fa72 (patch) | |
| tree | 1ba8bdf141beb2564cdb87f7c979a75be656eca9 /java/res | |
| parent | c436f3a1e2f8eadbceb74c4b1ed72c126fc34ef3 (diff) | |
| parent | 82a7b185bb8a14e610950548d36fae7a06030236 (diff) | |
| download | latinime-680fa7ba77d65b0aaaea90cff8892b687052fa72.tar.gz latinime-680fa7ba77d65b0aaaea90cff8892b687052fa72.tar.xz latinime-680fa7ba77d65b0aaaea90cff8892b687052fa72.zip | |
am 82a7b185: am 16ec2e11: Merge "Add finish action to setup wizard"
* commit '82a7b185bb8a14e610950548d36fae7a06030236':
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> |