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

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

Convert one letter Key.outputText to Key.code

This change also uses Key.code instead of Key.outputText for the
variety of parentheses keys taht introduced by I85998f17.

Bug: 5975484
Change-Id: I86879c9942d264edc71e5893325a2f582763d12f
parent 69f672a4
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -104,14 +104,14 @@
    <string name="more_keys_for_star">★,\u066d</string>
    <!-- The all letters need to be mirrored are found at
         http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
    <string name="output_text_for_left_parenthesis">)</string>
    <string name="output_text_for_right_parenthesis">(</string>
    <integer name="keycode_for_left_parenthesis">0x0029</integer>
    <integer name="keycode_for_right_parenthesis">0x0028</integer>
    <!-- \ufd3e: ORNATE LEFT PARENTHESIS
         \ufd3f: ORNATE RIGHT PARENTHESIS -->
    <string name="more_keys_for_left_parenthesis">[|],{|},&lt;|&gt;,\ufd3e|\ufd3f</string>
    <string name="more_keys_for_right_parenthesis">]|[,}|{,&gt;|&lt;,\ufd3f|\ufd3e</string>
    <string name="output_text_for_less_than">&gt;</string>
    <string name="output_text_for_greater_than">&lt;</string>
    <integer name="keycode_for_less_than">0x003e</integer>
    <integer name="keycode_for_greater_than">0x003c</integer>
    <!-- \u2264: LESS-THAN OR EQUAL TO
         \u2265: GREATER-THAN EQUAL TO
         \u00ab: LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
@@ -129,10 +129,10 @@
         \u201f: DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
    <string name="more_keys_for_less_than">\u2264|\u2265,\u00ab|\u00bb,\u2039|\u203a</string>
    <string name="more_keys_for_greater_than">\u2265|\u2264,\u00bb|\u00ab,\u203a|\u2039</string>
    <string name="output_text_for_left_square_bracket">]</string>
    <string name="output_text_for_right_square_bracket">[</string>
    <string name="output_text_for_left_curly_bracket">}</string>
    <string name="output_text_for_right_curly_bracket">{</string>
    <integer name="keycode_for_left_square_bracket">0x005d</integer>
    <integer name="keycode_for_right_square_bracket">0x005b</integer>
    <integer name="keycode_for_left_curly_bracket">0x007d</integer>
    <integer name="keycode_for_right_curly_bracket">0x007b</integer>
    <!-- Note: Neither DroidSans nor Roboto have a glyph for DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
    <!-- <string name="more_keys_for_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb</string> -->
    <!-- The 4-more keys will be displayed in order of "3,1,2,4". -->
+8 −8
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@
    <string name="more_keys_for_plus">±,﬩</string>
    <!-- The all letters need to be mirrored are found at
         http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
    <string name="output_text_for_left_parenthesis">)</string>
    <string name="output_text_for_right_parenthesis">(</string>
    <integer name="keycode_for_left_parenthesis">0x0029</integer>
    <integer name="keycode_for_right_parenthesis">0x0028</integer>
    <string name="more_keys_for_left_parenthesis">[|],{|},&lt;|&gt;</string>
    <string name="more_keys_for_right_parenthesis">]|[,}|{,&gt;|&lt;</string>
    <string name="output_text_for_less_than">&gt;</string>
    <string name="output_text_for_greater_than">&lt;</string>
    <integer name="keycode_for_less_than">0x003e</integer>
    <integer name="keycode_for_greater_than">0x003c</integer>
    <!-- \u2264: LESS-THAN OR EQUAL TO
         \u2265: GREATER-THAN EQUAL TO
         \u00ab: LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
@@ -45,10 +45,10 @@
         \u201f: DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
    <string name="more_keys_for_less_than">\u2264|\u2265,\u00ab|\u00bb,\u2039|\u203a</string>
    <string name="more_keys_for_greater_than">\u2265|\u2264,\u00bb|\u00ab,\u203a|\u2039</string>
    <string name="output_text_for_left_square_bracket">]</string>
    <string name="output_text_for_right_square_bracket">[</string>
    <string name="output_text_for_left_curly_bracket">}</string>
    <string name="output_text_for_right_curly_bracket">{</string>
    <integer name="keycode_for_left_square_bracket">0x005d</integer>
    <integer name="keycode_for_right_square_bracket">0x005b</integer>
    <integer name="keycode_for_left_curly_bracket">0x007d</integer>
    <integer name="keycode_for_right_curly_bracket">0x007b</integer>
    <!-- Note: Neither DroidSans nor Roboto have a glyph for DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
    <!-- <string name="more_keys_for_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb</string> -->
    <!-- The 4-more keys will be displayed in order of "3,1,2,4". -->
+8 −8
Original line number Diff line number Diff line
@@ -114,12 +114,12 @@
    <string name="more_keys_for_plus">±</string>
    <!-- The all letters need to be mirrored are found at
         http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
    <string name="output_text_for_left_parenthesis">(</string>
    <string name="output_text_for_right_parenthesis">)</string>
    <integer name="keycode_for_left_parenthesis">0x0028</integer>
    <integer name="keycode_for_right_parenthesis">0x0029</integer>
    <string name="more_keys_for_left_parenthesis">[,{,&lt;</string>
    <string name="more_keys_for_right_parenthesis">],},&gt;</string>
    <string name="output_text_for_less_than">&lt;</string>
    <string name="output_text_for_greater_than">&gt;</string>
    <integer name="keycode_for_less_than">0x003c</integer>
    <integer name="keycode_for_greater_than">0x003e</integer>
    <!-- \u2264: LESS-THAN OR EQUAL TO
         \u2265: GREATER-THAN EQUAL TO
         \u00ab: LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
@@ -137,10 +137,10 @@
         \u201f: DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
    <string name="more_keys_for_less_than">\u2264,\u00ab,\u2039</string>
    <string name="more_keys_for_greater_than">\u2265,\u00bb,\u203a</string>
    <string name="output_text_for_left_square_bracket">[</string>
    <string name="output_text_for_right_square_bracket">]</string>
    <string name="output_text_for_left_curly_bracket">{</string>
    <string name="output_text_for_right_curly_bracket">}</string>
    <integer name="keycode_for_left_square_bracket">0x005b</integer>
    <integer name="keycode_for_right_square_bracket">0x005d</integer>
    <integer name="keycode_for_left_curly_bracket">0x007b</integer>
    <integer name="keycode_for_right_curly_bracket">0x007d</integer>
    <!-- The 4-more keys will be displayed in order of "3,1,2,4". -->
    <string name="more_keys_for_single_quote">\u2019,\u201a,\u2018,\u201b</string>
    <!-- Note: Neither DroidSans nor Roboto have a glyph for DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@
>
    <Key
        latin:keyLabel="{"
        latin:keyOutputText="@string/output_text_for_left_curly_bracket" />
        latin:code="@integer/keycode_for_left_curly_bracket" />
    <Key
        latin:keyLabel="}"
        latin:keyOutputText="@string/output_text_for_right_curly_bracket" />
        latin:code="@integer/keycode_for_right_curly_bracket" />
</merge>
+2 −2
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@
>
    <Key
        latin:keyLabel="&lt;"
        latin:keyOutputText="@string/output_text_for_less_than"
        latin:code="@integer/keycode_for_less_than"
        latin:moreKeys="@string/more_keys_for_less_than" />
    <Key
        latin:keyLabel="&gt;"
        latin:keyOutputText="@string/output_text_for_greater_than"
        latin:code="@integer/keycode_for_greater_than"
        latin:moreKeys="@string/more_keys_for_greater_than" />
</merge>
Loading