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

am 37b9562f: Fix talk back of emoji key 

* commit '37b9562fd7b593c90d7ab383ec650f39a7c0f621':
  Fix talk back of emoji key
main
Tadashi G. Takaoka 2014-03-24 20:12:18 -07:00 committed by Android Git Automerger
parent 9aa2f8a764 37b9562fd7
commit 0430f94e94
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/res/values/strings.xml
View File

@ -192,8 +192,8 @@
<string name="spoken_description_space">Space</string> <string name="spoken_description_space">Space</string>
<!-- Spoken description for the "Mic" keyboard key. --> <!-- Spoken description for the "Mic" keyboard key. -->
<string name="spoken_description_mic">Voice input</string> <string name="spoken_description_mic">Voice input</string>
<!-- Spoken description for the "Smiley" keyboard key. --> <!-- Spoken description for the "Emoji" keyboard key. -->
<string name="spoken_description_smiley">Smiley face</string> <string name="spoken_description_emoji">Emoji</string>
<!-- Spoken description for the "Return" keyboard key. --> <!-- Spoken description for the "Return" keyboard key. -->
<string name="spoken_description_return">Return</string> <string name="spoken_description_return">Return</string>
<!-- Spoken description for the "Search" keyboard key. --> <!-- Spoken description for the "Search" keyboard key. -->

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

@ -58,9 +58,6 @@ public final class KeyCodeDescriptionMapper {
} }
private void initInternal() { private void initInternal() {
// Manual label substitutions for key labels with no string resource
mKeyLabelMap.put(":-)", R.string.spoken_description_smiley);
// Special non-character codes defined in Keyboard // Special non-character codes defined in Keyboard
mKeyCodeMap.put(Constants.CODE_SPACE, R.string.spoken_description_space); mKeyCodeMap.put(Constants.CODE_SPACE, R.string.spoken_description_space);
mKeyCodeMap.put(Constants.CODE_DELETE, R.string.spoken_description_delete); mKeyCodeMap.put(Constants.CODE_DELETE, R.string.spoken_description_delete);
@ -75,6 +72,7 @@ public final class KeyCodeDescriptionMapper {
mKeyCodeMap.put(Constants.CODE_ACTION_NEXT, R.string.spoken_description_action_next); mKeyCodeMap.put(Constants.CODE_ACTION_NEXT, R.string.spoken_description_action_next);
mKeyCodeMap.put(Constants.CODE_ACTION_PREVIOUS, mKeyCodeMap.put(Constants.CODE_ACTION_PREVIOUS,
R.string.spoken_description_action_previous); R.string.spoken_description_action_previous);
mKeyCodeMap.put(Constants.CODE_EMOJI, R.string.spoken_description_emoji);
} }
/** /**