nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 3b82e816: Merge "Fixed typing uppercase letters when touch exploration is enabled." 

* commit '3b82e8163c173b219320e78b96507f34e0a805c9':
  Fixed typing uppercase letters when touch exploration is enabled.
main
Svetoslav Ganov 2011-11-22 15:00:00 -08:00 committed by Android Git Automerger
parent 4ff8d47c14 3b82e8163c
commit 6808825a5f
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java
View File

@ -136,16 +136,14 @@ public class KeyCodeDescriptionMapper {
if (!TextUtils.isEmpty(key.mLabel)) { if (!TextUtils.isEmpty(key.mLabel)) {
final String label = key.mLabel.toString().trim(); final String label = key.mLabel.toString().trim();
// First, attempt to map the label to a pre-defined description.
if (mKeyLabelMap.containsKey(label)) { if (mKeyLabelMap.containsKey(label)) {
return context.getString(mKeyLabelMap.get(label)); return context.getString(mKeyLabelMap.get(label));
} else if (label.length() == 1
|| (keyboard.isManualTemporaryUpperCase() && !TextUtils
.isEmpty(key.mHintLabel))) {
return getDescriptionForKeyCode(context, keyboard, key, shouldObscure);
} else {
return label;
} }
} else if (key.mCode != Keyboard.CODE_DUMMY) { }
// Just attempt to speak the description.
if (key.mCode != Keyboard.CODE_DUMMY) {
return getDescriptionForKeyCode(context, keyboard, key, shouldObscure); return getDescriptionForKeyCode(context, keyboard, key, shouldObscure);
} }
@ -187,11 +185,14 @@ public class KeyCodeDescriptionMapper {
* @return the key code for the specified key * @return the key code for the specified key
*/ */
private int getCorrectKeyCode(Keyboard keyboard, Key key) { private int getCorrectKeyCode(Keyboard keyboard, Key key) {
if (keyboard.isManualTemporaryUpperCase() && !TextUtils.isEmpty(key.mHintLabel)) { // If keyboard is in manual temporary upper case state and key has
// manual temporary uppercase letter as key hint letter, alternate
// character code should be sent.
if (keyboard.isManualTemporaryUpperCase() && key.hasUppercaseLetter()
&& !TextUtils.isEmpty(key.mHintLabel)) {
return key.mHintLabel.charAt(0); return key.mHintLabel.charAt(0);
} else {
return key.mCode;
} }
return key.mCode;
} }
/** /**