Use more standard Unicode notations in keyboard layout resource files.
bug: 5988656
Change-Id: Ie2416ccd790f29934a37e9dc77d7525e5113048a
diff --git a/java/res/values/donottranslate-more-keys.xml b/java/res/values/donottranslate-more-keys.xml
index 17fd9a8..c04e6d0 100644
--- a/java/res/values/donottranslate-more-keys.xml
+++ b/java/res/values/donottranslate-more-keys.xml
@@ -40,30 +40,30 @@
<string name="keylabel_for_scandinavia_row2_11"></string>
<string name="more_keys_for_scandinavia_row2_10"></string>
<string name="more_keys_for_scandinavia_row2_11"></string>
- <!-- \u0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
- <string name="keylabel_for_slavic_shcha">\u0449</string>
- <!-- \u044b: "ы" CYRILLIC SMALL LETTER YERU -->
- <string name="keylabel_for_slavic_yery">\u044b</string>
- <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
- <string name="keylabel_for_slavic_i">\u0438</string>
+ <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
+ <string name="keylabel_for_slavic_shcha">щ</string>
+ <!-- U+044B: "ы" CYRILLIC SMALL LETTER YERU -->
+ <string name="keylabel_for_slavic_yery">ы</string>
+ <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
+ <string name="keylabel_for_slavic_i">и</string>
<string name="more_keys_for_slavic_u"></string>
<string name="more_keys_for_slavic_ye"></string>
<string name="more_keys_for_slavic_en"></string>
- <!-- \u044a: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
- <string name="more_keys_for_slavic_ha">\u044a</string>
+ <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <string name="more_keys_for_slavic_ha">ъ</string>
<string name="more_keys_for_slavic_yery"></string>
<string name="more_keys_for_slavic_o"></string>
- <!-- \u044a: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
- <string name="more_keys_for_slavic_soft_sign">\u044a</string>
- <!-- \u00a2: "¢" CENT SIGN
- \u00a3: "£" POUND SIGN
- \u20ac: "€" EURO SIGN
- \u00a5: "¥" YEN SIGN
- \u20b1: "₱" PESO SIGN -->
- <string name="more_keys_for_currency_dollar">\u00a2,\u00a3,\u20ac,\u00a5,\u20b1</string>
- <string name="more_keys_for_currency_euro">\u00a2,\u00a3,$,\u00a5,\u20b1</string>
- <string name="more_keys_for_currency_pound">\u00a2,$,\u20ac,\u00a5,\u20b1</string>
- <string name="more_keys_for_currency_general">\u00a2,$,\u20ac,\u00a3,\u00a5,\u20b1</string>
+ <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+ <string name="more_keys_for_slavic_soft_sign">ъ</string>
+ <!-- U+00A2: "¢" CENT SIGN
+ U+00A3: "£" POUND SIGN
+ U+20AC: "€" EURO SIGN
+ U+00A5: "¥" YEN SIGN
+ U+20B1: "₱" PESO SIGN -->
+ <string name="more_keys_for_currency_dollar">¢,£,€,¥,₱</string>
+ <string name="more_keys_for_currency_euro">¢,£,$,¥,₱</string>
+ <string name="more_keys_for_currency_pound">¢,$,€,¥,₱</string>
+ <string name="more_keys_for_currency_general">¢,$,€,£,¥,₱</string>
<string name="more_keys_for_smiley">":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\|:-\\\\ ,:\'(|:\'( ,:-D|:-D "</string>
<string name="more_keys_for_punctuation">"\\,,\?,!,:,-,\',\",(,),/,;,+,&,\@"</string>
<integer name="more_keys_keyboard_column_for_punctuation">7</integer>
@@ -91,31 +91,31 @@
<string name="additional_more_keys_for_symbols_8"></string>
<string name="additional_more_keys_for_symbols_9"></string>
<string name="additional_more_keys_for_symbols_0"></string>
- <!-- \u00b9: "¹" SUPERSCRIPT ONE
- \u00bd: "½" VULGAR FRACTION ONE HALF
- \u2153: "⅓" VULGAR FRACTION ONE THIRD
- \u00bc: "¼" VULGAR FRACTION ONE QUARTER
- \u215b: "⅛" VULGAR FRACTION ONE EIGHTH -->
- <string name="more_keys_for_symbols_1">\u00b9,\u00bd,\u2153,\u00bc,\u215b</string>
- <!-- \u00b2: "²" SUPERSCRIPT TWO
- \u2154: "⅔" VULGAR FRACTION TWO THIRDS -->
- <string name="more_keys_for_symbols_2">\u00b2,\u2154</string>
- <!-- \u00b3: "³" SUPERSCRIPT THREE
- \u00be: "¾" VULGAR FRACTION THREE QUARTERS
- \u215c: "⅜" VULGAR FRACTION THREE EIGHTHS -->
- <string name="more_keys_for_symbols_3">\u00b3,\u00be,\u215c</string>
- <!-- \u2074: "⁴" SUPERSCRIPT FOUR -->
- <string name="more_keys_for_symbols_4">\u2074</string>
- <!-- \u215d: "⅝" VULGAR FRACTION FIVE EIGHTHS -->
- <string name="more_keys_for_symbols_5">\u215d</string>
+ <!-- U+00B9: "¹" SUPERSCRIPT ONE
+ U+00BD: "½" VULGAR FRACTION ONE HALF
+ U+2153: "⅓" VULGAR FRACTION ONE THIRD
+ U+00BC: "¼" VULGAR FRACTION ONE QUARTER
+ U+215B: "⅛" VULGAR FRACTION ONE EIGHTH -->
+ <string name="more_keys_for_symbols_1">¹,½,⅓,¼,⅛</string>
+ <!-- U+00B2: "²" SUPERSCRIPT TWO
+ U+2154: "⅔" VULGAR FRACTION TWO THIRDS -->
+ <string name="more_keys_for_symbols_2">²,⅔</string>
+ <!-- U+00B3: "³" SUPERSCRIPT THREE
+ U+00BE: "¾" VULGAR FRACTION THREE QUARTERS
+ U+215C: "⅜" VULGAR FRACTION THREE EIGHTHS -->
+ <string name="more_keys_for_symbols_3">³,¾,⅜</string>
+ <!-- U+2074: "⁴" SUPERSCRIPT FOUR -->
+ <string name="more_keys_for_symbols_4">⁴</string>
+ <!-- U+215D: "⅝" VULGAR FRACTION FIVE EIGHTHS -->
+ <string name="more_keys_for_symbols_5">⅝</string>
<string name="more_keys_for_symbols_6"></string>
- <!-- \u215e: "⅞" VULGAR FRACTION SEVEN EIGHTHS -->
- <string name="more_keys_for_symbols_7">\u215e</string>
+ <!-- U+215E: "⅞" VULGAR FRACTION SEVEN EIGHTHS -->
+ <string name="more_keys_for_symbols_7">⅞</string>
<string name="more_keys_for_symbols_8"></string>
<string name="more_keys_for_symbols_9"></string>
- <!-- \u207f: "ⁿ" SUPERSCRIPT LATIN SMALL LETTER N
- \u2205: "∅" EMPTY SET -->
- <string name="more_keys_for_symbols_0">\u207f,\u2205</string>
+ <!-- U+207F: "ⁿ" SUPERSCRIPT LATIN SMALL LETTER N
+ U+2205: "∅" EMPTY SET -->
+ <string name="more_keys_for_symbols_0">ⁿ,∅</string>
<string name="keylabel_for_comma">,</string>
<string name="keylabel_for_f1">,</string>
<string name="keylabel_for_symbols_question">\?</string>
@@ -125,66 +125,74 @@
<string name="more_keys_for_f1"></string>
<string name="more_keys_for_f1_settings">\@icon/settingsKey|\@integer/key_settings</string>
<string name="more_keys_for_f1_navigate">\@icon/tabKey|\@integer/key_tab</string>
- <!-- \u00bf: "¿" INVERTED QUESTION MARK -->
- <string name="more_keys_for_symbols_question">\u00bf</string>
+ <!-- U+00BF: "¿" INVERTED QUESTION MARK -->
+ <string name="more_keys_for_symbols_question">¿</string>
<string name="more_keys_for_symbols_semicolon"></string>
- <!-- \u2030: "‰" PER MILLE SIGN -->
- <string name="more_keys_for_symbols_percent">\u2030</string>
+ <!-- U+2030: "‰" PER MILLE SIGN -->
+ <string name="more_keys_for_symbols_percent">‰</string>
<string name="keylabel_for_apostrophe">\'</string>
<string name="keylabel_for_dash">-</string>
<string name="keyhintlabel_for_apostrophe">\"</string>
<string name="keyhintlabel_for_dash">_</string>
<string name="more_keys_for_apostrophe">\"</string>
<string name="more_keys_for_dash">_</string>
- <!-- \u266a: "♪" EIGHTH NOTE
- \u2665: "♥" BLACK HEART SUIT
- \u2660: "♠" BLACK SPADE SUIT
- \u2666: "♦" BLACK DIAMOND SUIT
- \u2663: "♣" BLACK CLUB SUIT -->
- <string name="more_keys_for_bullet">\u266a,\u2665,\u2660,\u2666,\u2663</string>
- <!-- \u2020: "†" DAGGER
- \u2021: "‡" DOUBLE DAGGER
- \u2605: "★" BLACK STAR -->
- <string name="more_keys_for_star">\u2020,\u2021,\u2605</string>
- <!-- \u00b1: "±" PLUS-MINUS SIGN -->
- <string name="more_keys_for_plus">\u00b1</string>
+ <!-- U+266A: "♪" EIGHTH NOTE
+ U+2665: "♥" BLACK HEART SUIT
+ U+2660: "♠" BLACK SPADE SUIT
+ U+2666: "♦" BLACK DIAMOND SUIT
+ U+2663: "♣" BLACK CLUB SUIT -->
+ <string name="more_keys_for_bullet">♪,♥,♠,♦,♣</string>
+ <!-- U+2020: "†" DAGGER
+ U+2021: "‡" DOUBLE DAGGER
+ U+2605: "★" BLACK STAR -->
+ <string name="more_keys_for_star">†,‡,★</string>
+ <!-- U+00B1: "±" PLUS-MINUS SIGN -->
+ <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 -->
+ <!-- U+0028: "(" LEFT PARENTHESIS -->
<integer name="keycode_for_left_parenthesis">0x0028</integer>
+ <!-- U+0029: ")" RIGHT PARENTHESIS -->
<integer name="keycode_for_right_parenthesis">0x0029</integer>
<string name="more_keys_for_left_parenthesis">[,{,<</string>
<string name="more_keys_for_right_parenthesis">],},></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
- \u00bb: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
- \u2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
- \u203a: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+ <!-- U+003C: "<" LESS-THAN SIGN -->
+ <integer name="keycode_for_less_than">0x003C</integer>
+ <!-- U+003E: ">" GREATER-THAN SIGN -->
+ <integer name="keycode_for_greater_than">0x003E</integer>
+ <!-- U+2264: "≤" LESS-THAN OR EQUAL TO
+ U+2265: "≥" GREATER-THAN EQUAL TO
+ U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+ U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+ U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+ U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
The following characters don't need BIDI mirroring.
- \u2018: "‘" LEFT SINGLE QUOTATION MARK
- \u2019: "’" RIGHT SINGLE QUOTATION MARK
- \u201a: "‚" SINGLE LOW-9 QUOTATION MARK
- \u201b: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
- \u201c: "“" LEFT DOUBLE QUOTATION MARK
- \u201d: "”" RIGHT DOUBLE QUOTATION MARK
- \u201e: "„" DOUBLE LOW-9 QUOTATION MARK
- \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>
- <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>
+ U+2018: "‘" LEFT SINGLE QUOTATION MARK
+ U+2019: "’" RIGHT SINGLE QUOTATION MARK
+ U+201A: "‚" SINGLE LOW-9 QUOTATION MARK
+ U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
+ U+201C: "“" LEFT DOUBLE QUOTATION MARK
+ U+201D: "”" RIGHT DOUBLE QUOTATION MARK
+ U+201E: "„" DOUBLE LOW-9 QUOTATION MARK
+ U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+ <string name="more_keys_for_less_than">≤,«,‹</string>
+ <string name="more_keys_for_greater_than">≥,»,›</string>
+ <!-- U+005B: "[" LEFT SQUARE BRACKET -->
+ <integer name="keycode_for_left_square_bracket">0x005B</integer>
+ <!-- U+005D: "]" RIGHT SQUARE BRACKET -->
+ <integer name="keycode_for_right_square_bracket">0x005D</integer>
+ <!-- U+007B: "{" LEFT CURLY BRACKET -->
+ <integer name="keycode_for_left_curly_bracket">0x007B</integer>
+ <!-- U+007D: "}" RIGHT CURLY BRACKET -->
+ <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. -->
- <!-- <string name="more_keys_for_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb</string> -->
+ <string name="more_keys_for_single_quote">’,‚,‘,‛</string>
+ <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
+ <!-- <string name="more_keys_for_double_quote">“,”,„,‟,«,»</string> -->
<!-- The 4-more keys will be displayed in order of "3,1,2,4". -->
- <string name="more_keys_for_double_quote">\u201d,\u00ab,\u201c,\u00bb</string>
- <!-- Note: Neither DroidSans nor Roboto have a glyph for DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
- <!-- <string name="more_keys_for_tablet_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb,\u2018,\u2019,\u201a,\u201b</string> -->
+ <string name="more_keys_for_double_quote">”,«,“,»</string>
+ <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
+ <!-- <string name="more_keys_for_tablet_double_quote">“,”,„,‟,«,»,‘,’,‚,‛</string> -->
<!-- The 8-more keys with maxMoreKeysColumn=4 will be displayed in order of "3,1,2,4|7,5,6,8". -->
- <string name="more_keys_for_tablet_double_quote">\u201d,\u00ab,\u201c,\u00bb,\u2019,\u201a,\u2018,\u201b</string>
+ <string name="more_keys_for_tablet_double_quote">”,«,“,»,’,‚,‘,‛</string>
</resources>
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index a00dddf..d7a88bf 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -19,32 +19,30 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Symbols that are suggested between words -->
- <string name="suggested_punctuations">!,?,\\,,:,;,\u0022,(,),\u0027,-,/,@,_</string>
+ <string name="suggested_punctuations">!,?,\\,,:,;,\",(,),\',-,/,@,_</string>
<!-- Symbols that should be swapped with a magic space -->
- <string name="magic_space_swapping_symbols">.,;:!?)]}\u0022</string>
+ <string name="magic_space_swapping_symbols">.,;:!?)]}\"</string>
<!-- Symbols that should strip a magic space -->
- <string name="magic_space_stripping_symbols">\u0009\u0020\n/_\u0027-</string>
+ <string name="magic_space_stripping_symbols">	 \n/_\'-</string>
<!-- Symbols that should convert magic spaces into real space -->
<string name="magic_space_promoting_symbols">([*&@{<>+=|</string>
<!-- Symbols that do NOT separate words -->
- <string name="symbols_excluded_from_word_separators">\u0027-</string>
+ <string name="symbols_excluded_from_word_separators">\'-</string>
<!-- Word separator list is the union of all symbols except those that are not separators:
magic_space_swapping_symbols | magic_space_stripping_symbols |
magic_space_neutral_symbols \ symbols_excluded_from_word_separators -->
<!-- Symbol characters list that should switch back to the main layout -->
- <!-- \u0022: """ QUOTATION MARK (double quotation mark)
- \u0027: "'" APOSTROPHE (single quotation mark)
- \u2018: "‘" LEFT SINGLE QUOTATION MARK
- \u2019: "’" RIGHT SINGLE QUOTATION MARK
- \u201a: "‚" SINGLE LOW-9 QUOTATION MARK
- \u201b: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
- \u201c: "“" LEFT DOUBLE QUOTATION MARK
- \u201d: "”" RIGHT DOUBLE QUOTATION MARK
- \u201e: "„" DOUBLE LOW-9 QUOTATION MARK
- \u201f: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK
- \u00ab: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
- \u00bb: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
- <!-- string name="layout_switch_back_symbols">\u0022\u0027\u2018\u2019\u201a\u201b\u201c\u201d\u201e\u201f\u00ab\u00bb</string> -->
+ <!-- U+2018: "‘" LEFT SINGLE QUOTATION MARK
+ U+2019: "’" RIGHT SINGLE QUOTATION MARK
+ U+201A: "‚" SINGLE LOW-9 QUOTATION MARK
+ U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
+ U+201C: "“" LEFT DOUBLE QUOTATION MARK
+ U+201D: "”" RIGHT DOUBLE QUOTATION MARK
+ U+201E: "„" DOUBLE LOW-9 QUOTATION MARK
+ U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK
+ U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+ U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
+ <!-- <string name="layout_switch_back_symbols">\"\'‘’‚‛“”„‟«»</string> -->
<string name="layout_switch_back_symbols"></string>
<!-- Label for "switch to more symbol" modifier key. Must be short to fit on key! -->
@@ -57,7 +55,9 @@
<!-- Label for "switch to phone numeric" key. Must be short to fit on key! -->
<string name="label_to_phone_numeric_key">123</string>
<!-- Label for "switch to phone symbols" key. Must be short to fit on key! -->
- <string name="label_to_phone_symbols_key">\uff0a\uff03</string>
+ <!-- U+FF0A: "＊" FULLWIDTH ASTERISK
+ U+FF03: "＃" FULLWIDTH NUMBER SIGN -->
+ <string name="label_to_phone_symbols_key">＊＃</string>
<!-- Always show the suggestion strip -->
<string name="prefs_suggestion_visibility_show_value">0</string>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 525b775..c8b6421 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -182,7 +182,7 @@
<string name="spoken_description_smiley">Smiley face</string>
<!-- Spoken description for the "Return" keyboard key. -->
<string name="spoken_description_return">Return</string>
- <!-- Spoken description for the "\u2022" (BULLET) keyboard key. -->
+ <!-- Spoken description for the "U+2022" (BULLET) keyboard key. -->
<string name="spoken_description_dot">Dot</string>
<!-- Spoken feedback after turning "Shift" mode on. -->
@@ -301,7 +301,7 @@
<string name="select_language">Input languages</string>
<!-- Add to dictionary hint -->
- <string name="hint_add_to_dictionary">\u2190 Touch again to save</string>
+ <string name="hint_add_to_dictionary">← Touch again to save</string>
<!-- Inform the user that a particular language has an available dictionary -->
<string name="has_dictionary">Dictionary available</string>
diff --git a/java/res/values/touch-position-correction.xml b/java/res/values/touch-position-correction.xml
index 0a0e4e5..41b435a 100644
--- a/java/res/values/touch-position-correction.xml
+++ b/java/res/values/touch-position-correction.xml
@@ -71,4 +71,4 @@
<item>0.0880847</item>
<item>0.1522819</item>
</string-array>
-</resources>
\ No newline at end of file
+</resources>