Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1643ed6 authored by Charles Chen's avatar Charles Chen Committed by Android (Google) Code Review
Browse files

Merge "Add accessibility descriptions for additional non-character keys."

parents c51d45ac ba037c62

java/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -181,6 +181,12 @@ 
    <string name="spoken_description_search">Search</string>

    <!-- Spoken description for the "U+2022" (BULLET) keyboard key. -->

    <string name="spoken_description_dot">Dot</string>

    <!-- Spoken description for the "Switch language" keyboard key. -->

    <string name="spoken_description_language_switch">Switch language</string>

    <!-- Spoken description for the "Next" action keyboard key. -->

    <string name="spoken_description_action_next">Next</string>

    <!-- Spoken description for the "Previous" action keyboard key. -->

    <string name="spoken_description_action_previous">Previous</string>



    <!-- Spoken feedback after turning "Shift" mode on. -->

    <string name="spoken_description_shiftmode_on">Shift enabled</string>

java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java

+5 −5
Original line number Diff line number Diff line
@@ -60,10 +60,8 @@ public class KeyCodeDescriptionMapper { 
        // Manual label substitutions for key labels with no string resource

        mKeyLabelMap.put(":-)", R.string.spoken_description_smiley);



        // Symbols that most TTS engines can't speak

        mKeyCodeMap.put(' ', R.string.spoken_description_space);



        // Special non-character codes defined in Keyboard

        mKeyCodeMap.put(Keyboard.CODE_SPACE, R.string.spoken_description_space);

        mKeyCodeMap.put(Keyboard.CODE_DELETE, R.string.spoken_description_delete);

        mKeyCodeMap.put(Keyboard.CODE_ENTER, R.string.spoken_description_return);

        mKeyCodeMap.put(Keyboard.CODE_SETTINGS, R.string.spoken_description_settings);
@@ -71,6 +69,9 @@ public class KeyCodeDescriptionMapper { 
        mKeyCodeMap.put(Keyboard.CODE_SHORTCUT, R.string.spoken_description_mic);

        mKeyCodeMap.put(Keyboard.CODE_SWITCH_ALPHA_SYMBOL, R.string.spoken_description_to_symbol);

        mKeyCodeMap.put(Keyboard.CODE_TAB, R.string.spoken_description_tab);

        mKeyCodeMap.put(Keyboard.CODE_LANGUAGE_SWITCH, R.string.spoken_description_language_switch);

        mKeyCodeMap.put(Keyboard.CODE_ACTION_NEXT, R.string.spoken_description_action_next);

        mKeyCodeMap.put(Keyboard.CODE_ACTION_PREVIOUS, R.string.spoken_description_action_previous);

    }



    /**
@@ -274,8 +275,7 @@ public class KeyCodeDescriptionMapper { 
            return context.getString(OBSCURED_KEY_RES_ID);

        }



        final int resId = mKeyCodeMap.get(code);

        if (resId != 0) {

        if (mKeyCodeMap.indexOfKey(code) >= 0) {

            return context.getString(mKeyCodeMap.get(code));

        } else if (isDefinedNonCtrl) {

            return Character.toString((char) code);