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

Commit ac3720ce authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Fix layout switch keys' label of no language subtype keyboard 

This change moves the following string from resources to
KeyboardTextsSet.
- label_to_alpha_key
- label_to_symbols_key
- label_to_symbols_with_microphone_key

Bug: 7697799
Change-Id: Icf9b8848de4c70f792e336f2ae274dab12be79ee
parent 0c2b8ad5

java/res/values/strings.xml

+0 −7
Original line number Diff line number Diff line
@@ -147,13 +147,6 @@ 
    <string name="label_done_key">Done</string>

    <!-- Label for soft enter key when it performs SEND action.  Must be short to fit on key! [CHAR LIMIT=5] -->

    <string name="label_send_key">Send</string>

    <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! [CHAR LIMIT=3] -->

    <string name="label_to_alpha_key">ABC</string>

    <!-- Label for "switch to symbols" key.  Must be short to fit on key! [CHAR LIMIT=4] -->

    <string name="label_to_symbol_key">\?123</string>

    <!-- Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"

         part because it'll be appended by the code. Must be short to fit on key! [CHAR LIMIT=3] -->

    <string name="label_to_symbol_with_microphone_key">123</string>

    <!-- Label for "Pause" key of phone number keyboard.  Must be short to fit on key! [CHAR LIMIT=5] -->

    <string name="label_pause_key">Pause</string>

    <!-- Label for "Wait" key of phone number keyboard.  Must be short to fit on key! [CHAR LIMIT=5]-->

java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java

+500 −354

File changed.

Preview size limit exceeded, changes collapsed.

tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl

+0 −3
Original line number Diff line number Diff line
@@ -97,9 +97,6 @@ public final class KeyboardTextsSet { 
        "label_done_key",

        "label_previous_key",

        // Other labels.

        "label_to_alpha_key",

        "label_to_symbol_key",

        "label_to_symbol_with_microphone_key",

        "label_pause_key",

        "label_wait_key",

    };

tools/maketext/res/values-ar/donottranslate-more-keys.xml

+12 −0
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ 
*/

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Label for "switch to alphabetic" key.

         U+0623: "ا" ARABIC LETTER ALEF

         U+200C: ZERO WIDTH NON-JOINER

         U+0628: "ب" ARABIC LETTER BEH

         U+062C: "پ" ARABIC LETTER PEH -->

    <string name="label_to_alpha_key">&#x0623;&#x200C;&#x0628;&#x200C;&#x062C;</string>

    <!-- U+0661: "١" ARABIC-INDIC DIGIT ONE -->

    <string name="keylabel_for_symbols_1">&#x0661;</string>

    <!-- U+0662: "٢" ARABIC-INDIC DIGIT TWO -->
@@ -38,6 +44,12 @@ 
    <string name="keylabel_for_symbols_9">&#x0669;</string>

    <!-- U+0660: "٠" ARABIC-INDIC DIGIT ZERO -->

    <string name="keylabel_for_symbols_0">&#x0660;</string>

    <!-- Label for "switch to symbols" key.

         U+061F: "؟" ARABIC QUESTION MARK -->

    <string name="label_to_symbol_key">&#x0663;&#x0662;&#x0661;&#x061F;</string>

    <!-- Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"

         part because it'll be appended by the code. -->

    <string name="label_to_symbol_with_microphone_key">&#x0663;&#x0662;&#x0661;</string>

    <string name="additional_more_keys_for_symbols_1">1</string>

    <string name="additional_more_keys_for_symbols_2">2</string>

    <string name="additional_more_keys_for_symbols_3">3</string>

tools/maketext/res/values-be/donottranslate-more-keys.xml

+5 −0
Original line number Diff line number Diff line
@@ -32,4 +32,9 @@ 
    <string name="more_keys_for_cyrillic_ie">&#x0451;</string>

    <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->

    <string name="more_keys_for_cyrillic_soft_sign">&#x044A;</string>

    <!-- Label for "switch to alphabetic" key.

         U+0410: "А" CYRILLIC CAPITAL LETTER A

         U+0411: "Б" CYRILLIC CAPITAL LETTER BE

         U+0412: "В" CYRILLIC CAPITAL LETTER VE -->

    <string name="label_to_alpha_key">&#x0410;&#x0411;&#x0412;</string>

</resources>