diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-05-13 07:37:08 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-05-13 07:37:08 +0000 |
| commit | 191105a5d8ec1fb21d42b725d0a483dbbf7e7ea4 (patch) | |
| tree | a941183c02002428cb93cee07a0a60126524959c /java | |
| parent | d66cb986f7689564749586e5e85bf2cc5efb90fd (diff) | |
| parent | aaffc46e8255cbafd6a6fbeb5afa0eb9604150e4 (diff) | |
| download | latinime-191105a5d8ec1fb21d42b725d0a483dbbf7e7ea4.tar.gz latinime-191105a5d8ec1fb21d42b725d0a483dbbf7e7ea4.tar.xz latinime-191105a5d8ec1fb21d42b725d0a483dbbf7e7ea4.zip | |
Merge "Fix inconsistent TalkBack descriptions of keyboard modes"
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values/strings-talkback-descriptions.xml | 12 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java | 7 |
2 files changed, 14 insertions, 5 deletions
diff --git a/java/res/values/strings-talkback-descriptions.xml b/java/res/values/strings-talkback-descriptions.xml index 4ffca10c8..80406d02f 100644 --- a/java/res/values/strings-talkback-descriptions.xml +++ b/java/res/values/strings-talkback-descriptions.xml @@ -35,10 +35,14 @@ <string name="spoken_description_unknown">Key code %d</string> <!-- Spoken description for the "Shift" keyboard key when "Shift" is off. --> <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. --> - <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. --> - <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. --> <string name="spoken_description_delete">Delete</string> <!-- Spoken description for the "To Symbol" keyboard key. --> @@ -76,8 +80,8 @@ <string name="spoken_description_shiftmode_locked">Caps lock enabled</string> <!-- Spoken feedback after changing to the symbols keyboard. --> <string name="spoken_description_mode_symbol">Symbols mode</string> - <!-- Spoken feedback after changing to the symbols shift keyboard. --> - <string name="spoken_description_mode_symbol_shift">Symbols shift mode</string> + <!-- Spoken feedback after changing to the 2nd symbols (a.k.a. symbols shift) keyboard. --> + <string name="spoken_description_mode_symbol_shift">More symbols mode</string> <!-- Spoken feedback after changing to the alphanumeric keyboard. --> <string name="spoken_description_mode_alpha">Letters mode</string> <!-- Spoken feedback after changing to the phone dialer keyboard. --> diff --git a/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java b/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java index 2e6649bf2..0499a3456 100644 --- a/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java +++ b/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java @@ -189,9 +189,14 @@ public final class KeyCodeDescriptionMapper { break; case KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED: case KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED: - case KeyboardId.ELEMENT_SYMBOLS_SHIFTED: resId = R.string.spoken_description_shift_shifted; 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: resId = R.string.spoken_description_shift; } |