diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-02-05 18:26:14 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2014-02-06 16:42:57 +0900 |
| commit | d6f147e14293d717e94ae30f1f33750adec6b9c5 (patch) | |
| tree | 5ea54b24b97c645c05ee75f4eadf334ea9b1f271 /java/src/com/android/inputmethod | |
| parent | 6193217f5c850bcfa393e18bbf3dc6e34f4cc220 (diff) | |
| download | latinime-d6f147e14293d717e94ae30f1f33750adec6b9c5.tar.gz latinime-d6f147e14293d717e94ae30f1f33750adec6b9c5.tar.xz latinime-d6f147e14293d717e94ae30f1f33750adec6b9c5.zip | |
Consolidate keyOutputText with keyLabel attribute
Change-Id: I90ea2c9d5ce42fabc79599995a2fae1f5f652a6b
Diffstat (limited to 'java/src/com/android/inputmethod')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/Key.java | 6 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyStylesSet.java | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java index 9715557c7..1b9007da2 100644 --- a/java/src/com/android/inputmethod/keyboard/Key.java +++ b/java/src/com/android/inputmethod/keyboard/Key.java @@ -347,12 +347,8 @@ public class Key implements Comparable<Key> { mHintLabel = StringUtils.toUpperCaseOfStringForLocale(style.getString(keyAttr, R.styleable.Keyboard_Key_keyHintLabel), needsToUpperCase, locale); } - final String outputTextInAttr = style.getString( - keyAttr, R.styleable.Keyboard_Key_keyOutputText); - final String rawOutputText = (outputTextInAttr != null) ? outputTextInAttr - : KeySpecParser.getOutputText(keySpec); String outputText = StringUtils.toUpperCaseOfStringForLocale( - rawOutputText, needsToUpperCase, locale); + KeySpecParser.getOutputText(keySpec), needsToUpperCase, locale); // Choose the first letter of the label as primary code if not specified. if (code == CODE_UNSPECIFIED && TextUtils.isEmpty(outputText) && !TextUtils.isEmpty(mLabel)) { diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyStylesSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyStylesSet.java index f7e43a6c2..a64f23501 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyStylesSet.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyStylesSet.java @@ -138,7 +138,6 @@ public final class KeyStylesSet { readString(keyAttr, R.styleable.Keyboard_Key_code); readString(keyAttr, R.styleable.Keyboard_Key_altCode); readString(keyAttr, R.styleable.Keyboard_Key_keyLabel); - readString(keyAttr, R.styleable.Keyboard_Key_keyOutputText); readString(keyAttr, R.styleable.Keyboard_Key_keyHintLabel); readStringArray(keyAttr, R.styleable.Keyboard_Key_moreKeys); readStringArray(keyAttr, R.styleable.Keyboard_Key_additionalMoreKeys); |