diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-02-06 01:37:50 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-02-06 01:37:50 -0800 |
| commit | 32ca47a547df5a45bf1f481f998cb61c8219ea59 (patch) | |
| tree | 8876e41612d63face12bd141e3e783777f58792c /java/src | |
| parent | 5e6a8dd6d9e697d0adf9534c9dc081cebd0ff71f (diff) | |
| parent | 48ea52800ac490b0c32c91b9982c7e01a455ffe5 (diff) | |
| download | latinime-32ca47a547df5a45bf1f481f998cb61c8219ea59.tar.gz latinime-32ca47a547df5a45bf1f481f998cb61c8219ea59.tar.xz latinime-32ca47a547df5a45bf1f481f998cb61c8219ea59.zip | |
am 48ea5280: Merge "Consolidate keyOutputText with keyLabel attribute"
* commit '48ea52800ac490b0c32c91b9982c7e01a455ffe5':
Consolidate keyOutputText with keyLabel attribute
Diffstat (limited to 'java/src')
| -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); |