diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-05-15 10:36:16 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-05-15 10:36:16 -0700 |
| commit | 76cc6abc3aff9c39eec29824d88d2d4b4bc29fb6 (patch) | |
| tree | afbdb78cc423b66b2820531a79d665918bae0848 /java/src | |
| parent | 16268307010821edeb18183f8dae357f8829243d (diff) | |
| parent | 0206339a2664d1cb05fff3ff20352cf04871bef1 (diff) | |
| download | latinime-76cc6abc3aff9c39eec29824d88d2d4b4bc29fb6.tar.gz latinime-76cc6abc3aff9c39eec29824d88d2d4b4bc29fb6.tar.xz latinime-76cc6abc3aff9c39eec29824d88d2d4b4bc29fb6.zip | |
am 0206339a: am 47a78aeb: Merge "Finalize setup wizard strings and mark as translatable"
* commit '0206339a2664d1cb05fff3ff20352cf04871bef1':
Finalize setup wizard strings and mark as translatable
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/setup/SetupActivity.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java index 15d0bac37..2ecd260ab 100644 --- a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java +++ b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java @@ -113,13 +113,13 @@ public final class SetupActivity extends Activity { // the SDK version. final TextView titleView = (TextView)findViewById(R.id.setup_title); final int appName = getApplicationInfo().labelRes; - titleView.setText(getString(R.string.setup_title, getString(appName))); + titleView.setText(getString(R.string.setup_steps_title, getString(appName))); mStepIndicatorView = (SetupStepIndicatorView)findViewById(R.id.setup_step_indicator); final SetupStep step1 = new SetupStep(findViewById(R.id.setup_step1), appName, R.string.setup_step1_title, R.string.setup_step1_instruction, - R.drawable.ic_settings_language, R.string.language_settings); + R.drawable.ic_settings_language, R.string.setup_step1_action); step1.setAction(new Runnable() { @Override public void run() { @@ -131,7 +131,7 @@ public final class SetupActivity extends Activity { final SetupStep step2 = new SetupStep(findViewById(R.id.setup_step2), appName, R.string.setup_step2_title, R.string.setup_step2_instruction, - 0 /* actionIcon */, R.string.select_input_method); + 0 /* actionIcon */, R.string.setup_step2_action); step2.setAction(new Runnable() { @Override public void run() { @@ -143,8 +143,8 @@ public final class SetupActivity extends Activity { mSetupSteps.addStep(STEP_2, step2); final SetupStep step3 = new SetupStep(findViewById(R.id.setup_step3), - appName, R.string.setup_step3_title, 0 /* instruction */, - R.drawable.sym_keyboard_language_switch, R.string.setup_step3_instruction); + appName, R.string.setup_step3_title, R.string.setup_step3_instruction, + R.drawable.sym_keyboard_language_switch, R.string.setup_step3_action); step3.setAction(new Runnable() { @Override public void run() { |