diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-05-15 10:58:58 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-05-15 10:58:58 -0700 |
| commit | b713600a52b802f899d33c46a3e89df143855dbd (patch) | |
| tree | cb82f38127d9058ab7780dc12da53d64360af16d /java/res | |
| parent | dfa5d2d799e4f2b6192acc9ab2f381e8e2d2b615 (diff) | |
| parent | fd4baafe710dc0fe843c7672a6bd8bee4244fd73 (diff) | |
| download | latinime-b713600a52b802f899d33c46a3e89df143855dbd.tar.gz latinime-b713600a52b802f899d33c46a3e89df143855dbd.tar.xz latinime-b713600a52b802f899d33c46a3e89df143855dbd.zip | |
am fd4baafe: am 46913aed: Merge "Add next axction to setup wizard"
* commit 'fd4baafe710dc0fe843c7672a6bd8bee4244fd73':
Add next axction to setup wizard
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/layout/setup_steps_cards.xml | 6 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/java/res/layout/setup_steps_cards.xml b/java/res/layout/setup_steps_cards.xml index 6c46461fe..245173122 100644 --- a/java/res/layout/setup_steps_cards.xml +++ b/java/res/layout/setup_steps_cards.xml @@ -56,6 +56,12 @@ layout="@layout/setup_step" /> </FrameLayout> <TextView + android:id="@+id/setup_next" + android:text="@string/setup_next_action" + android:gravity="end|center_vertical" + style="@style/setupStepActionLabelStyleCommon" + android:layout_marginTop="@dimen/setup_step_horizontal_line_height" /> + <TextView android:id="@+id/setup_finish" android:text="@string/setup_finish_action" style="@style/setupStepActionLabelStyle" diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 1f5e41bc5..d36394778 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -461,6 +461,8 @@ <string name="setup_step1_title">"Enable <xliff:g id="application_name">%s</xliff:g>"</string> <!-- Detailed instruction of the 1st step in the setup wizard. [CHAR LIMIT=120] --> <string name="setup_step1_instruction">"Please check \"<xliff:g id="application_name">%s</xliff:g>\" in your Language & input settings. This will authorize it to run on your device."</string> + <!-- Detailed instruction of the already finished 1st step in the setup wizard. [CHAR LIMIT=120] --> + <string name="setup_step1_finished_instruction">"<xliff:g id="application_name">%s</xliff:g> is already enabled in your Language & input settings, so this step is done. On to the next one!"</string> <!-- The label of the button that triggers the Language & input settings in order to enable the keyboard. [CHAR_LIMIT=64] --> <string name="setup_step1_action">Enable in Settings</string> <!-- Ordinal number of the 2nd step in the setup wizard. [CHAR LIMIT=5] --> |