From 520a297ad1d148a57bcf6559a9802d5d49182d70 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Sat, 25 Jun 2011 19:38:55 +0900 Subject: Draw phone/number keyboard layout witout icon This change introduces: * New KeyboardView attribute * keyLargeLetterRatio to specify large letter text size. * keyHintLabelRatio to specify hint label text size. * keyHintLabelColor to specify hint label text color. * keyPreviewTextRatio to specify key preview text size. * New Key.keyLabelOption flags * alignLeftOfCenter, align the key label slightly left of the key center. * largeLetter, use keyLargeLetterRatio to draw key letter. * hasHintLabel, draw keyHintLabel at the right of key letter. * followKeyHintLabelRatio, draw the key label following keyHintLabelRatio size. * Renames * Key.keyHintLetter to keyHintLabel. * Key.keylLabelOption fontFixedWidth to fontMonoSpace. * Key.keylLabelOption popupHint to hasPopupHint. * Removes * number icon releted attributes and declarations. Change-Id: I2f456737e3a46209e5f48b5155951b2b21a33859 --- .../android/inputmethod/accessibility/KeyCodeDescriptionMapper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java') diff --git a/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java b/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java index 154f4af91..a31911d60 100644 --- a/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java +++ b/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java @@ -134,7 +134,7 @@ public class KeyCodeDescriptionMapper { return context.getString(mKeyLabelMap.get(label)); } else if (label.length() == 1 || (keyboard.isManualTemporaryUpperCase() && !TextUtils - .isEmpty(key.mHintLetter))) { + .isEmpty(key.mHintLabel))) { return getDescriptionForKeyCode(context, keyboard, key); } else { return label; @@ -181,8 +181,8 @@ public class KeyCodeDescriptionMapper { * @return the key code for the specified key */ private int getCorrectKeyCode(Keyboard keyboard, Key key) { - if (keyboard.isManualTemporaryUpperCase() && !TextUtils.isEmpty(key.mHintLetter)) { - return key.mHintLetter.charAt(0); + if (keyboard.isManualTemporaryUpperCase() && !TextUtils.isEmpty(key.mHintLabel)) { + return key.mHintLabel.charAt(0); } else { return key.mCode; } -- cgit v1.2.3-83-g751a