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

am cc38306d: Only speak key label after checking for password obscure flag. 

* commit 'cc38306d4fd7774a64582b5060e9071e95929fd1':
  Only speak key label after checking for password obscure flag.
main
alanv 2012-05-19 02:23:04 -07:00 committed by Android Git Automerger
parent e9b13a2685 cc38306d4f
commit 6b9651068b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,9 +111,6 @@ public class KeyCodeDescriptionMapper {
if (mKeyLabelMap.containsKey(label)) {
return context.getString(mKeyLabelMap.get(label));
}
// Otherwise, return the label.
return key.mLabel;
}
// Just attempt to speak the description.
@ -229,6 +226,8 @@ public class KeyCodeDescriptionMapper {
return context.getString(mKeyCodeMap.get(code));
} else if (isDefinedNonCtrl) {
return Character.toString((char) code);
} else if (!TextUtils.isEmpty(key.mLabel)) {
return key.mLabel;
} else {
return context.getString(R.string.spoken_description_unknown, code);
}