nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Opening punctuations have a priority in Spanish keyboard 

Bug: 6737535
Change-Id: I87442eb978ac68be3d3df99eed8a92877a6f4ab0
main
Tadashi G. Takaoka 2012-07-17 11:32:12 +09:00
parent c21aca9006
commit af2c115253
5 changed files with 99 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/res/xml-sw600dp/rowkeys_symbols3.xml
View File

@ -49,7 +49,7 @@
<Key <Key
latin:keyLabel="." /> latin:keyLabel="." />
<Key <Key
latin:keyLabel="!text/keylabel_for_symbols_exclamation" latin:keyLabel="!"
latin:moreKeys="!text/more_keys_for_symbols_exclamation" /> latin:moreKeys="!text/more_keys_for_symbols_exclamation" />
<Key <Key
latin:keyLabel="!text/keylabel_for_symbols_question" latin:keyLabel="!text/keylabel_for_symbols_question"

2
java/res/xml/rowkeys_symbols3.xml
View File

@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
> >
<Key <Key
latin:keyLabel="!text/keylabel_for_symbols_exclamation" latin:keyLabel="!"
latin:moreKeys="!text/more_keys_for_symbols_exclamation" /> latin:moreKeys="!text/more_keys_for_symbols_exclamation" />
<switch> <switch>
<case <case

201
java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
View File

@ -195,38 +195,37 @@ public final class KeyboardTextsSet {
/* 87 */ "more_keys_for_symbols_0", /* 87 */ "more_keys_for_symbols_0",
/* 88 */ "keylabel_for_comma", /* 88 */ "keylabel_for_comma",
/* 89 */ "more_keys_for_comma", /* 89 */ "more_keys_for_comma",
/* 90 */ "keylabel_for_symbols_exclamation", /* 90 */ "keylabel_for_symbols_question",
/* 91 */ "keylabel_for_symbols_question", /* 91 */ "keylabel_for_symbols_semicolon",
/* 92 */ "keylabel_for_symbols_semicolon", /* 92 */ "keylabel_for_symbols_percent",
/* 93 */ "keylabel_for_symbols_percent", /* 93 */ "more_keys_for_symbols_exclamation",
/* 94 */ "more_keys_for_symbols_exclamation", /* 94 */ "more_keys_for_symbols_question",
/* 95 */ "more_keys_for_symbols_question", /* 95 */ "more_keys_for_symbols_semicolon",
/* 96 */ "more_keys_for_symbols_semicolon", /* 96 */ "more_keys_for_symbols_percent",
/* 97 */ "more_keys_for_symbols_percent", /* 97 */ "keylabel_for_tablet_comma",
/* 98 */ "keylabel_for_tablet_comma", /* 98 */ "keyhintlabel_for_tablet_comma",
/* 99 */ "keyhintlabel_for_tablet_comma", /* 99 */ "more_keys_for_tablet_comma",
/* 100 */ "more_keys_for_tablet_comma", /* 100 */ "keyhintlabel_for_tablet_period",
/* 101 */ "keyhintlabel_for_tablet_period", /* 101 */ "more_keys_for_tablet_period",
/* 102 */ "more_keys_for_tablet_period", /* 102 */ "keylabel_for_apostrophe",
/* 103 */ "keylabel_for_apostrophe", /* 103 */ "keyhintlabel_for_apostrophe",
/* 104 */ "keyhintlabel_for_apostrophe", /* 104 */ "more_keys_for_apostrophe",
/* 105 */ "more_keys_for_apostrophe", /* 105 */ "more_keys_for_am_pm",
/* 106 */ "more_keys_for_am_pm", /* 106 */ "settings_as_more_key",
/* 107 */ "settings_as_more_key", /* 107 */ "shortcut_as_more_key",
/* 108 */ "shortcut_as_more_key", /* 108 */ "action_next_as_more_key",
/* 109 */ "action_next_as_more_key", /* 109 */ "action_previous_as_more_key",
/* 110 */ "action_previous_as_more_key", /* 110 */ "label_to_more_symbol_key",
/* 111 */ "label_to_more_symbol_key", /* 111 */ "label_to_more_symbol_for_tablet_key",
/* 112 */ "label_to_more_symbol_for_tablet_key", /* 112 */ "label_tab_key",
/* 113 */ "label_tab_key", /* 113 */ "label_to_phone_numeric_key",
/* 114 */ "label_to_phone_numeric_key", /* 114 */ "label_to_phone_symbols_key",
/* 115 */ "label_to_phone_symbols_key", /* 115 */ "label_time_am",
/* 116 */ "label_time_am", /* 116 */ "label_time_pm",
/* 117 */ "label_time_pm", /* 117 */ "label_to_symbol_key_pcqwerty",
/* 118 */ "label_to_symbol_key_pcqwerty", /* 118 */ "keylabel_for_popular_domain",
/* 119 */ "keylabel_for_popular_domain", /* 119 */ "more_keys_for_popular_domain",
/* 120 */ "more_keys_for_popular_domain", /* 120 */ "more_keys_for_smiley",
/* 121 */ "more_keys_for_smiley",
}; };
private static final String EMPTY = ""; private static final String EMPTY = "";
@ -331,52 +330,51 @@ public final class KeyboardTextsSet {
/* 87 */ "\u207F,\u2205", /* 87 */ "\u207F,\u2205",
/* 88 */ ",", /* 88 */ ",",
/* 89 */ EMPTY, /* 89 */ EMPTY,
/* 90 */ "!", /* 90 */ "?",
/* 91 */ "?", /* 91 */ ";",
/* 92 */ ";", /* 92 */ "%",
/* 93 */ "%",
// U+00A1: "¡" INVERTED EXCLAMATION MARK // U+00A1: "¡" INVERTED EXCLAMATION MARK
/* 94 */ "\u00A1", /* 93 */ "\u00A1",
// U+00BF: "¿" INVERTED QUESTION MARK // U+00BF: "¿" INVERTED QUESTION MARK
/* 95 */ "\u00BF", /* 94 */ "\u00BF",
/* 96 */ EMPTY, /* 95 */ EMPTY,
// U+2030: "‰" PER MILLE SIGN // U+2030: "‰" PER MILLE SIGN
/* 97 */ "\u2030", /* 96 */ "\u2030",
/* 98 */ ",", /* 97 */ ",",
/* 98 */ "!",
/* 99 */ "!", /* 99 */ "!",
/* 100 */ "!", /* 100 */ "?",
/* 101 */ "?", /* 101 */ "?",
/* 102 */ "?", /* 102 */ "\'",
/* 103 */ "\'", /* 103 */ "\"",
/* 104 */ "\"", /* 104 */ "\"",
/* 105 */ "\"", /* 105 */ "!fixedColumnOrder!2,!hasLabels!,!text/label_time_am,!text/label_time_pm",
/* 106 */ "!fixedColumnOrder!2,!hasLabels!,!text/label_time_am,!text/label_time_pm", /* 106 */ "!icon/settings_key|!code/key_settings",
/* 107 */ "!icon/settings_key|!code/key_settings", /* 107 */ "!icon/shortcut_key|!code/key_shortcut",
/* 108 */ "!icon/shortcut_key|!code/key_shortcut", /* 108 */ "!hasLabels!,!text/label_next_key|!code/key_action_next",
/* 109 */ "!hasLabels!,!text/label_next_key|!code/key_action_next", /* 109 */ "!hasLabels!,!text/label_previous_key|!code/key_action_previous",
/* 110 */ "!hasLabels!,!text/label_previous_key|!code/key_action_previous",
// Label for "switch to more symbol" modifier key. Must be short to fit on key! // Label for "switch to more symbol" modifier key. Must be short to fit on key!
/* 111 */ "= \\ <", /* 110 */ "= \\ <",
// Label for "switch to more symbol" modifier key on tablets. Must be short to fit on key! // Label for "switch to more symbol" modifier key on tablets. Must be short to fit on key!
/* 112 */ "~ \\ {", /* 111 */ "~ \\ {",
// Label for "Tab" key. Must be short to fit on key! // Label for "Tab" key. Must be short to fit on key!
/* 113 */ "Tab", /* 112 */ "Tab",
// Label for "switch to phone numeric" key. Must be short to fit on key! // Label for "switch to phone numeric" key. Must be short to fit on key!
/* 114 */ "123", /* 113 */ "123",
// Label for "switch to phone symbols" key. Must be short to fit on key! // Label for "switch to phone symbols" key. Must be short to fit on key!
// U+FF0A: "＊" FULLWIDTH ASTERISK // U+FF0A: "＊" FULLWIDTH ASTERISK
// U+FF03: "＃" FULLWIDTH NUMBER SIGN // U+FF03: "＃" FULLWIDTH NUMBER SIGN
/* 115 */ "\uFF0A\uFF03", /* 114 */ "\uFF0A\uFF03",
// Key label for "ante meridiem" // Key label for "ante meridiem"
/* 116 */ "AM", /* 115 */ "AM",
// Key label for "post meridiem" // Key label for "post meridiem"
/* 117 */ "PM", /* 116 */ "PM",
// Label for "switch to symbols" key on PC QWERTY layout // Label for "switch to symbols" key on PC QWERTY layout
/* 118 */ "Sym", /* 117 */ "Sym",
/* 119 */ ".com", /* 118 */ ".com",
// popular web domains for the locale - most popular, displayed on the keyboard // popular web domains for the locale - most popular, displayed on the keyboard
/* 120 */ "!hasLabels!,.net,.org,.gov,.edu", /* 119 */ "!hasLabels!,.net,.org,.gov,.edu",
/* 121 */ "!fixedColumnOrder!5,!hasLabels!,=-O|=-O ,:-P|:-P ,;-)|;-) ,:-(|:-( ,:-)|:-) ,:-!|:-! ,:-$|:-$ ,B-)|B-) ,:O|:O ,:-*|:-* ,:-D|:-D ,:\'(|:\'( ,:-\\\\|:-\\\\ ,O:-)|O:-) ,:-[|:-[ ", /* 120 */ "!fixedColumnOrder!5,!hasLabels!,=-O|=-O ,:-P|:-P ,;-)|;-) ,:-(|:-( ,:-)|:-) ,:-!|:-! ,:-$|:-$ ,B-)|B-) ,:O|:O ,:-*|:-* ,:-D|:-D ,:\'(|:\'( ,:-\\\\|:-\\\\ ,O:-)|O:-) ,:-[|:-[ ",
}; };
/* Language ar: Arabic */ /* Language ar: Arabic */
@ -483,25 +481,24 @@ public final class KeyboardTextsSet {
// U+060C: "،" ARABIC COMMA // U+060C: "،" ARABIC COMMA
/* 88 */ "\u060C", /* 88 */ "\u060C",
/* 89 */ "\\,", /* 89 */ "\\,",
/* 90 */ null, /* 90 */ "\u061F",
/* 91 */ "\u061F", /* 91 */ "\u061B",
/* 92 */ "\u061B",
// U+066A: "٪" ARABIC PERCENT SIGN // U+066A: "٪" ARABIC PERCENT SIGN
/* 93 */ "\u066A", /* 92 */ "\u066A",
/* 94 */ null, /* 93 */ null,
/* 95 */ "?", /* 94 */ "?",
/* 96 */ ";", /* 95 */ ";",
// U+2030: "‰" PER MILLE SIGN // U+2030: "‰" PER MILLE SIGN
/* 97 */ "\\%,\u2030", /* 96 */ "\\%,\u2030",
/* 98~ */ /* 97~ */
null, null, null, null, null, null, null, null, null, null,
/* ~102 */ /* ~101 */
// U+060C: "،" ARABIC COMMA // U+060C: "،" ARABIC COMMA
// U+061B: "؛" ARABIC SEMICOLON // U+061B: "؛" ARABIC SEMICOLON
// U+061F: "؟" ARABIC QUESTION MARK // U+061F: "؟" ARABIC QUESTION MARK
/* 103 */ "\u060C", /* 102 */ "\u060C",
/* 104 */ "\u061F", /* 103 */ "\u061F",
/* 105 */ "\u061F,\u061B,!,:,-,/,\',\"", /* 104 */ "\u061F,\u061B,!,:,-,/,\',\"",
}; };
/* Language be: Belarusian */ /* Language be: Belarusian */
@ -861,27 +858,18 @@ public final class KeyboardTextsSet {
/* ~47 */ /* ~47 */
// U+00A1: "¡" INVERTED EXCLAMATION MARK // U+00A1: "¡" INVERTED EXCLAMATION MARK
// U+00BF: "¿" INVERTED QUESTION MARK // U+00BF: "¿" INVERTED QUESTION MARK
/* 48 */ "!fixedColumnOrder!9,\",\',#,-,\u00A1,!,\u00BF,\\,,?,@,&,\\%,+,;,:,/,(,)", /* 48 */ "!fixedColumnOrder!9,\u00A1,\",\',#,-,:,!,\\,,?,\u00BF,@,&,\\%,+,;,/,(,)",
/* 49~ */ /* 49~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~89 */ null, null, null, null, null,
// U+00A1: "¡" INVERTED EXCLAMATION MARK
/* 90 */ "\u00A1",
// U+00BF: "¿" INVERTED QUESTION MARK
/* 91 */ "\u00BF",
/* 92 */ null,
/* 93 */ null,
/* 94 */ "!",
/* 95 */ "?",
/* 96~ */
null, null, null,
/* ~98 */ /* ~98 */
/* 99 */ "\u00A1", // U+00A1: "¡" INVERTED EXCLAMATION MARK
/* 100 */ "\u00A1,!", /* 99 */ "!,\u00A1",
/* 101 */ "\u00BF", /* 100 */ null,
/* 102 */ "\u00BF,?", // U+00BF: "¿" INVERTED QUESTION MARK
/* 101 */ "?,\u00BF",
}; };
/* Language et: Estonian */ /* Language et: Estonian */
@ -1088,29 +1076,28 @@ public final class KeyboardTextsSet {
// U+060C: "،" ARABIC COMMA // U+060C: "،" ARABIC COMMA
/* 88 */ "\u060C", /* 88 */ "\u060C",
/* 89 */ "\\,", /* 89 */ "\\,",
/* 90 */ null, /* 90 */ "\u061F",
/* 91 */ "\u061F", /* 91 */ "\u061B",
/* 92 */ "\u061B",
// U+066A: "٪" ARABIC PERCENT SIGN // U+066A: "٪" ARABIC PERCENT SIGN
/* 93 */ "\u066A", /* 92 */ "\u066A",
/* 94 */ null, /* 93 */ null,
/* 95 */ "?", /* 94 */ "?",
/* 96 */ ";", /* 95 */ ";",
// U+2030: "‰" PER MILLE SIGN // U+2030: "‰" PER MILLE SIGN
/* 97 */ "\\%,\u2030", /* 96 */ "\\%,\u2030",
// U+060C: "،" ARABIC COMMA // U+060C: "،" ARABIC COMMA
// U+061B: "؛" ARABIC SEMICOLON // U+061B: "؛" ARABIC SEMICOLON
// U+061F: "؟" ARABIC QUESTION MARK // U+061F: "؟" ARABIC QUESTION MARK
// U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK // U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
// U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK // U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
/* 98 */ "\u060C", /* 97 */ "\u060C",
/* 99 */ "!", /* 98 */ "!",
/* 100 */ "!,\\,", /* 99 */ "!,\\,",
/* 101 */ "\u061F", /* 100 */ "\u061F",
/* 102 */ "\u061F,?", /* 101 */ "\u061F,?",
/* 103 */ "\u060C", /* 102 */ "\u060C",
/* 104 */ "\u061F", /* 103 */ "\u061F",
/* 105 */ "!fixedColumnOrder!4,:,!,\u061F,\u061B,-,/,\u00AB|\u00BB,\u00BB|\u00AB", /* 104 */ "!fixedColumnOrder!4,:,!,\u061F,\u061B,-,/,\u00AB|\u00BB,\u00BB|\u00AB",
}; };
/* Language fi: Finnish */ /* Language fi: Finnish */

12
tools/maketext/res/values-es/donottranslate-more-keys.xml
View File

@ -69,15 +69,9 @@
<string name="more_keys_for_c">&#x00E7;,&#x0107;,&#x010D;</string> <string name="more_keys_for_c">&#x00E7;,&#x0107;,&#x010D;</string>
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK
U+00BF: "¿" INVERTED QUESTION MARK --> U+00BF: "¿" INVERTED QUESTION MARK -->
<string name="more_keys_for_punctuation">"!fixedColumnOrder!9,\",\',#,-,&#x00A1;,!,&#x00BF;,\\,,\?,\@,&amp;,\\%,+,;,:,/,(,)"</string> <string name="more_keys_for_punctuation">"!fixedColumnOrder!9,&#x00A1;,\",\',#,-,:,!,\\,,\?,&#x00BF;,\@,&amp;,\\%,+,;,/,(,)"</string>
<string name="keyhintlabel_for_tablet_comma">&#x00A1;</string>
<string name="more_keys_for_tablet_comma">"&#x00A1;,!"</string>
<string name="keyhintlabel_for_tablet_period">&#x00BF;</string>
<string name="more_keys_for_tablet_period">"&#x00BF;,\?"</string>
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK --> <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
<string name="keylabel_for_symbols_exclamation">"&#x00A1;"</string> <string name="more_keys_for_tablet_comma">"!,&#x00A1;"</string>
<!-- U+00BF: "¿" INVERTED QUESTION MARK --> <!-- U+00BF: "¿" INVERTED QUESTION MARK -->
<string name="keylabel_for_symbols_question">"&#x00BF;"</string> <string name="more_keys_for_tablet_period">"\?,&#x00BF;"</string>
<string name="more_keys_for_symbols_exclamation">"!"</string>
<string name="more_keys_for_symbols_question">"\?"</string>
</resources> </resources>

1
tools/maketext/res/values/donottranslate-more-keys.xml
View File

@ -158,7 +158,6 @@
<string name="more_keys_for_symbols_0">&#x207F;,&#x2205;</string> <string name="more_keys_for_symbols_0">&#x207F;,&#x2205;</string>
<string name="keylabel_for_comma">,</string> <string name="keylabel_for_comma">,</string>
<string name="more_keys_for_comma"></string> <string name="more_keys_for_comma"></string>
<string name="keylabel_for_symbols_exclamation">!</string>
<string name="keylabel_for_symbols_question">\?</string> <string name="keylabel_for_symbols_question">\?</string>
<string name="keylabel_for_symbols_semicolon">;</string> <string name="keylabel_for_symbols_semicolon">;</string>
<string name="keylabel_for_symbols_percent">%</string> <string name="keylabel_for_symbols_percent">%</string>