diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-03-24 20:12:18 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-03-24 20:12:18 -0700 |
| commit | 0430f94e94f358ae4b28882fd0e743919cb2e40f (patch) | |
| tree | 6686be75ac853f2758ca13f1a10fa8875ef433f7 | |
| parent | 9aa2f8a764280a51d2c74a498681f22dbf02075b (diff) | |
| parent | 37b9562fd7b593c90d7ab383ec650f39a7c0f621 (diff) | |
| download | latinime-0430f94e94f358ae4b28882fd0e743919cb2e40f.tar.gz latinime-0430f94e94f358ae4b28882fd0e743919cb2e40f.tar.xz latinime-0430f94e94f358ae4b28882fd0e743919cb2e40f.zip | |
am 37b9562f: Fix talk back of emoji key
* commit '37b9562fd7b593c90d7ab383ec650f39a7c0f621':
Fix talk back of emoji key
| -rw-r--r-- | java/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index bd18e5544..e38bdd64e 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -192,8 +192,8 @@ <string name="spoken_description_space">Space</string> <!-- Spoken description for the "Mic" keyboard key. --> <string name="spoken_description_mic">Voice input</string> - <!-- Spoken description for the "Smiley" keyboard key. --> - <string name="spoken_description_smiley">Smiley face</string> + <!-- Spoken description for the "Emoji" keyboard key. --> + <string name="spoken_description_emoji">Emoji</string> <!-- Spoken description for the "Return" keyboard key. --> <string name="spoken_description_return">Return</string> <!-- Spoken description for the "Search" keyboard key. --> diff --git a/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java b/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java index 58624a2e6..2e6649bf2 100644 --- a/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java +++ b/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java @@ -58,9 +58,6 @@ public final class KeyCodeDescriptionMapper { } 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 mKeyCodeMap.put(Constants.CODE_SPACE, R.string.spoken_description_space); 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_PREVIOUS, R.string.spoken_description_action_previous); + mKeyCodeMap.put(Constants.CODE_EMOJI, R.string.spoken_description_emoji); } /** |