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

am 4cd86d3b: Cleanup exclamation and questuion keys 

* commit '4cd86d3bb4ec21856130074d5255cfe362ff2939':
  Cleanup exclamation and questuion keys
main
Tadashi G. Takaoka 2013-12-05 06:28:03 -08:00 committed by Android Git Automerger
parent 4ef5820f5f 4cd86d3bb4
commit 2487f68095
13 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/res/xml-sw600dp/keys_exclamation_question.xml
View File

@ -22,7 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
latin:keyLabel="!" />
latin:keyLabel="!"
latin:moreKeys="!text/more_keys_for_exclamation" />
<Key
latin:keyLabel="\?" />
latin:keyLabel="\?"
latin:moreKeys="!text/more_keys_for_question" />
</merge>

4
java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
View File

@ -40,7 +40,7 @@
latin:keyHintLabel="\?"
latin:additionalMoreKeys="\?"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_question" />
latin:moreKeys="!text/more_keys_for_question" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
@ -58,7 +58,7 @@
latin:moreKeys="!fixedColumnOrder!3,&#x203A;,&#x2265;,&#x00BB;" />
<Key
latin:keyLabel="\?"
latin:moreKeys="!text/more_keys_for_symbols_question" />
latin:moreKeys="!text/more_keys_for_question" />
</default>
</switch>
</merge>

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

@ -31,7 +31,7 @@
latin:keyHintLabel="!"
latin:additionalMoreKeys="!"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_exclamation,!text/more_keys_for_symbols_1" />
latin:moreKeys="!text/more_keys_for_exclamation,!text/more_keys_for_symbols_1" />
<Key
latin:keyLabel="2"
latin:keyHintLabel="\@"

4
java/res/xml/keys_pcqwerty4_right3.xml
View File

@ -34,7 +34,7 @@
<Key
latin:keyLabel="/"
latin:additionalMoreKeys="\?"
latin:moreKeys="!text/more_keys_for_symbols_question" />
latin:moreKeys="!text/more_keys_for_question" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
@ -52,7 +52,7 @@
latin:moreKeys="!fixedColumnOrder!3,&#x203A;,&#x2265;,&#x00BB;" />
<Key
latin:keyLabel="\?"
latin:moreKeys="!text/more_keys_for_symbols_question" />
latin:moreKeys="!text/more_keys_for_question" />
</default>
</switch>
</merge>

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

@ -26,7 +26,7 @@
latin:additionalMoreKeys="~" />
<Key
latin:keyLabel="1"
latin:additionalMoreKeys="!,!text/more_keys_for_symbols_exclamation"
latin:additionalMoreKeys="!,!text/more_keys_for_exclamation"
latin:moreKeys="!text/more_keys_for_symbols_1" />
<Key
latin:keyLabel="2"

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

@ -25,7 +25,7 @@
latin:keyLabel="~" />
<Key
latin:keyLabel="!"
latin:additionalMoreKeys="!text/more_keys_for_symbols_exclamation" />
latin:additionalMoreKeys="!text/more_keys_for_exclamation" />
<Key
latin:keyLabel="\@" />
<Key

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

@ -55,8 +55,8 @@
latin:moreKeys="!text/more_keys_for_symbols_semicolon" />
<Key
latin:keyLabel="!"
latin:moreKeys="!text/more_keys_for_symbols_exclamation" />
latin:moreKeys="!text/more_keys_for_exclamation" />
<Key
latin:keyLabel="!text/keylabel_for_symbols_question"
latin:moreKeys="!text/more_keys_for_symbols_question" />
latin:moreKeys="!text/more_keys_for_question" />
</merge>

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

@ -208,8 +208,8 @@ public final class KeyboardTextsSet {
/* 103 */ "keylabel_for_symbols_question",
/* 104 */ "keylabel_for_symbols_semicolon",
/* 105 */ "keylabel_for_symbols_percent",
/* 106 */ "more_keys_for_symbols_exclamation",
/* 107 */ "more_keys_for_symbols_question",
/* 106 */ "more_keys_for_exclamation",
/* 107 */ "more_keys_for_question",
/* 108 */ "more_keys_for_symbols_semicolon",
/* 109 */ "more_keys_for_symbols_percent",
/* 110 */ "keylabel_for_tablet_comma",
@ -605,7 +605,8 @@ public final class KeyboardTextsSet {
// U+066A: "٪" ARABIC PERCENT SIGN
/* 105 */ "\u066A",
/* 106 */ null,
/* 107 */ "?",
// U+00BF: "¿" INVERTED QUESTION MARK
/* 107 */ "?,\u00BF",
/* 108 */ ";",
// U+2030: "‰" PER MILLE SIGN
/* 109 */ "\\%,\u2030",
@ -1275,15 +1276,8 @@ public final class KeyboardTextsSet {
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,
/* ~111 */
// U+00A1: "¡" INVERTED EXCLAMATION MARK
/* 112 */ "!,\u00A1",
/* 113 */ null,
// U+00BF: "¿" INVERTED QUESTION MARK
/* 114 */ "?,\u00BF",
/* 115~ */
null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null,
/* ~120 */
// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
/* 121 */ "\u00F1",
@ -1508,7 +1502,8 @@ public final class KeyboardTextsSet {
// U+066A: "٪" ARABIC PERCENT SIGN
/* 105 */ "\u066A",
/* 106 */ null,
/* 107 */ "?",
// U+00BF: "¿" INVERTED QUESTION MARK
/* 107 */ "?,\u00BF",
/* 108 */ ";",
// U+2030: "‰" PER MILLE SIGN
/* 109 */ "\\%,\u2030",

3
tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml
View File

@ -69,7 +69,8 @@
<string name="keylabel_for_symbols_semicolon">&#x061B;</string>
<!-- U+066A: "٪" ARABIC PERCENT SIGN -->
<string name="keylabel_for_symbols_percent">&#x066A;</string>
<string name="more_keys_for_symbols_question">\?</string>
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
<string name="more_keys_for_question">\?,&#x00BF;</string>
<string name="more_keys_for_symbols_semicolon">;</string>
<!-- U+2030: "‰" PER MILLE SIGN -->
<string name="more_keys_for_symbols_percent">\\%,&#x2030;</string>

4
tools/make-keyboard-text/res/values-es/donottranslate-more-keys.xml
View File

@ -72,8 +72,4 @@
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK
U+00BF: "¿" INVERTED QUESTION MARK -->
<string name="more_keys_for_punctuation">"!fixedColumnOrder!4,;,!,\\,,\?,:,&#x00A1;,\@,&#x00BF;"</string>
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
<string name="more_keys_for_tablet_comma">"!,&#x00A1;"</string>
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
<string name="more_keys_for_period">"\?,&#x00BF;"</string>
</resources>

3
tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml
View File

@ -69,7 +69,8 @@
<string name="keylabel_for_symbols_semicolon">&#x061B;</string>
<!-- U+066A: "٪" ARABIC PERCENT SIGN -->
<string name="keylabel_for_symbols_percent">&#x066A;</string>
<string name="more_keys_for_symbols_question">\?</string>
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
<string name="more_keys_for_question">\?,&#x00BF;</string>
<string name="more_keys_for_symbols_semicolon">;</string>
<!-- U+2030: "‰" PER MILLE SIGN -->
<string name="more_keys_for_symbols_percent">\\%,&#x2030;</string>

4
tools/make-keyboard-text/res/values-hy/donottranslate-more-keys.xml
View File

@ -29,10 +29,10 @@
<string name="more_keys_for_punctuation">"!fixedColumnOrder!8,!,?,\\,,.,&#x058A;,&#x055C;,&#x055D;,&#x055E;,:,;,\@,&#x0559;,&#x055A;,&#x055B;,&#x055F;"</string>
<!-- U+055E: "՞" ARMENIAN QUESTION MARK -->
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
<string name="more_keys_for_symbols_question">&#x055E;,&#x00BF;</string>
<string name="more_keys_for_question">&#x055E;,&#x00BF;</string>
<!-- U+055C: "՜" ARMENIAN EXCLAMATION MARK -->
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
<string name="more_keys_for_symbols_exclamation">&#x055C;,&#x00A1;</string>
<string name="more_keys_for_exclamation">&#x055C;,&#x00A1;</string>
<!-- U+058F: "֏" ARMENIAN DRAM SIGN -->
<!-- TODO: Enable this when we have glyph for the following letter
<string name="keylabel_for_currency">&#x058F;</string>

4
tools/make-keyboard-text/res/values/donottranslate-more-keys.xml
View File

@ -166,9 +166,9 @@
<string name="keylabel_for_symbols_semicolon">;</string>
<string name="keylabel_for_symbols_percent">%</string>
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
<string name="more_keys_for_symbols_exclamation">&#x00A1;</string>
<string name="more_keys_for_exclamation">&#x00A1;</string>
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
<string name="more_keys_for_symbols_question">&#x00BF;</string>
<string name="more_keys_for_question">&#x00BF;</string>
<string name="more_keys_for_symbols_semicolon"></string>
<!-- U+2030: "‰" PER MILLE SIGN -->
<string name="more_keys_for_symbols_percent">&#x2030;</string>