From d6f147e14293d717e94ae30f1f33750adec6b9c5 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Wed, 5 Feb 2014 18:26:14 +0900 Subject: Consolidate keyOutputText with keyLabel attribute Change-Id: I90ea2c9d5ce42fabc79599995a2fae1f5f652a6b --- java/src/com/android/inputmethod/keyboard/Key.java | 6 +----- .../src/com/android/inputmethod/keyboard/internal/KeyStylesSet.java | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'java/src') 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 { 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); -- cgit v1.2.3-83-g751a