diff options
| author |   satok <satok@google.com> | 2012-01-11 21:32:57 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-01-11 21:32:57 -0800 |
| commit | 79cf99ccfc6a8274bd8ffa2ec5aa50aeb156da33 (patch) | |
| tree | 39680a80b70351e9742f1171a273cb420a0d7a13 /java | |
| parent | cd22c011ba8c1fd14ec984b2eb6dd49b42d26e27 (diff) | |
| parent | 53f56ddef9f5e9e5eee86b95a9d8e1f2878d5e24 (diff) | |
| download | latinime-79cf99ccfc6a8274bd8ffa2ec5aa50aeb156da33.tar.gz latinime-79cf99ccfc6a8274bd8ffa2ec5aa50aeb156da33.tar.xz latinime-79cf99ccfc6a8274bd8ffa2ec5aa50aeb156da33.zip | |
am 53f56dde: Merge "Change the application name of aosp latin ime"
* commit '53f56ddef9f5e9e5eee86b95a9d8e1f2878d5e24':
Change the application name of aosp latin ime
Diffstat (limited to 'java')
| -rw-r--r-- | java/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml index 888d73f5c..e663c90f2 100644 --- a/java/AndroidManifest.xml +++ b/java/AndroidManifest.xml @@ -7,13 +7,13 @@ <uses-permission android:name="android.permission.READ_USER_DICTIONARY" /> <uses-permission android:name="android.permission.READ_CONTACTS" /> - <application android:label="@string/english_ime_name" + <application android:label="@string/aosp_android_keyboard_ime_name" android:icon="@drawable/ic_ime_settings" android:backupAgent="BackupAgent" android:killAfterRestore="false"> <service android:name="LatinIME" - android:label="@string/english_ime_name" + android:label="@string/aosp_android_keyboard_ime_name" android:permission="android.permission.BIND_INPUT_METHOD"> <intent-filter> <action android:name="android.view.InputMethod" /> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 8f999215e..d860a1b23 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -20,6 +20,8 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Title for Latin keyboard --> <string name="english_ime_name">Android keyboard</string> + <!-- Application name for opensource Android keyboard. AOSP(Android Open Source Project) should not be translated. --> + <string name="aosp_android_keyboard_ime_name">Android keyboard (AOSP)</string> <!-- Title for Latin keyboard settings activity / dialog --> <string name="english_ime_settings">Android keyboard settings</string> <!-- Title for Latin keyboard input options dialog [CHAR LIMIT=25] --> |