diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-01-10 18:13:34 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2012-01-13 14:35:43 +0900 |
| commit | 4015a64a263b07178b99d3e3e864bd75da017638 (patch) | |
| tree | 92229b3a19cd419e774f0ce0c64aeb398806427d /java | |
| parent | 16d5e196dc12254670ff43f622234c892db547e4 (diff) | |
| download | latinime-4015a64a263b07178b99d3e3e864bd75da017638.tar.gz latinime-4015a64a263b07178b99d3e3e864bd75da017638.tar.xz latinime-4015a64a263b07178b99d3e3e864bd75da017638.zip | |
Fix SubtypeLocaleTests
Change-Id: Id85814aa3bcd9cacbe446b2dfda3ca2ab9146c13
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values/donottranslate.xml | 2 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/method.xml | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 1f7736d9c..e6f036d53 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -161,6 +161,8 @@ <!-- Generic subtype label --> <string name="subtype_generic">%s</string> + <!-- Description for generic QWERTY keyboard subtype --> + <string name="subtype_generic_qwerty">%s (QWERTY)</string> <!-- dictionary pack package name /settings activity (for shared prefs and settings) --> <string name="dictionary_pack_package_name">com.google.android.inputmethod.latin.dictionarypack</string> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index d860a1b23..f7d8b4533 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -335,8 +335,6 @@ <!-- Title of the item to change the keyboard theme [CHAR LIMIT=20]--> <string name="keyboard_layout">Keyboard theme</string> - <!-- Description for German QWERTY keyboard subtype [CHAR LIMIT=22] --> - <string name="subtype_de_qwerty">German QWERTY</string> <!-- Description for English (United Kingdom) keyboard subtype [CHAR LIMIT=22] --> <string name="subtype_en_GB">English (UK)</string> <!-- Description for English (United States) keyboard subtype [CHAR LIMIT=22] --> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index a3b1d5859..6c827363c 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -71,7 +71,7 @@ android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" - android:label="@string/subtype_de_qwerty" + android:label="@string/subtype_generic_qwerty" android:imeSubtypeLocale="de" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,KeyboardLocale=de_ZZ,SupportTouchPositionCorrection" diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java index 3433cd455..4d2aeeccf 100644 --- a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java @@ -806,7 +806,7 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke return bounds.width(); } - // Layout local language name and left and right arrow on spacebar. + // Layout locale language name on spacebar. private static String layoutSpacebar(Paint paint, Locale locale, int width, float origTextSize) { final Rect bounds = new Rect(); |