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

am 191105a5: Merge "Fix inconsistent TalkBack descriptions of keyboard modes" 

* commit '191105a5d8ec1fb21d42b725d0a483dbbf7e7ea4':
  Fix inconsistent TalkBack descriptions of keyboard modes
main
Tadashi G. Takaoka 2014-05-13 07:41:06 +00:00 committed by Android Git Automerger
parent cbc0c5d577 191105a5d8
commit 6354dc1def
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
java/res/values/strings-talkback-descriptions.xml
View File

@ -35,10 +35,14 @@
<string name="spoken_description_unknown">Key code %d</string> <string name="spoken_description_unknown">Key code %d</string>
<!-- Spoken description for the "Shift" keyboard key when "Shift" is off. --> <!-- Spoken description for the "Shift" keyboard key when "Shift" is off. -->
<string name="spoken_description_shift">Shift</string> <string name="spoken_description_shift">Shift</string>
<!-- Spoken description for the "Shift" keyboard key in symbols mode. -->
<string name="spoken_description_symbols_shift">More symbols</string>
<!-- Spoken description for the "Shift" keyboard key when "Shift" is on. --> <!-- Spoken description for the "Shift" keyboard key when "Shift" is on. -->
<string name="spoken_description_shift_shifted">Shift on (tap to disable)</string> <string name="spoken_description_shift_shifted">Shift</string>
<!-- Spoken description for the "Shift" keyboard key in 2nd symbols (a.k.a. symbols shift) mode. -->
<string name="spoken_description_symbols_shift_shifted">Symbols</string>
<!-- Spoken description for the "Shift" keyboard key when "Caps lock" is on. --> <!-- Spoken description for the "Shift" keyboard key when "Caps lock" is on. -->
<string name="spoken_description_caps_lock">Caps lock on (tap to disable)</string> <string name="spoken_description_caps_lock">Shift</string>
<!-- Spoken description for the "Delete" keyboard key. --> <!-- Spoken description for the "Delete" keyboard key. -->
<string name="spoken_description_delete">Delete</string> <string name="spoken_description_delete">Delete</string>
<!-- Spoken description for the "To Symbol" keyboard key. --> <!-- Spoken description for the "To Symbol" keyboard key. -->
@ -76,8 +80,8 @@
<string name="spoken_description_shiftmode_locked">Caps lock enabled</string> <string name="spoken_description_shiftmode_locked">Caps lock enabled</string>
<!-- Spoken feedback after changing to the symbols keyboard. --> <!-- Spoken feedback after changing to the symbols keyboard. -->
<string name="spoken_description_mode_symbol">Symbols mode</string> <string name="spoken_description_mode_symbol">Symbols mode</string>
<!-- Spoken feedback after changing to the symbols shift keyboard. --> <!-- Spoken feedback after changing to the 2nd symbols (a.k.a. symbols shift) keyboard. -->
<string name="spoken_description_mode_symbol_shift">Symbols shift mode</string> <string name="spoken_description_mode_symbol_shift">More symbols mode</string>
<!-- Spoken feedback after changing to the alphanumeric keyboard. --> <!-- Spoken feedback after changing to the alphanumeric keyboard. -->
<string name="spoken_description_mode_alpha">Letters mode</string> <string name="spoken_description_mode_alpha">Letters mode</string>
<!-- Spoken feedback after changing to the phone dialer keyboard. --> <!-- Spoken feedback after changing to the phone dialer keyboard. -->

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

@ -189,9 +189,14 @@ public final class KeyCodeDescriptionMapper {
break; break;
case KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED: case KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED:
case KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED: case KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED:
case KeyboardId.ELEMENT_SYMBOLS_SHIFTED:
resId = R.string.spoken_description_shift_shifted; resId = R.string.spoken_description_shift_shifted;
break; break;
case KeyboardId.ELEMENT_SYMBOLS:
resId = R.string.spoken_description_symbols_shift;
break;
case KeyboardId.ELEMENT_SYMBOLS_SHIFTED:
resId = R.string.spoken_description_symbols_shift_shifted;
break;
default: default:
resId = R.string.spoken_description_shift; resId = R.string.spoken_description_shift;
} }