diff options
author | 2010-09-08 16:51:50 +0900 | |
---|---|---|
committer | 2010-09-08 18:16:30 +0900 | |
commit | c29ef3ec1553b30f5e6ad4ba21e505c09e019421 (patch) | |
tree | 8160cd16691a2957253f691d4b9c2677a5337686 /java/res/xml-fr | |
parent | 12b6fef349fde1396be3949c2ae48f876c0a93f7 (diff) | |
download | latinime-c29ef3ec1553b30f5e6ad4ba21e505c09e019421.tar.gz latinime-c29ef3ec1553b30f5e6ad4ba21e505c09e019421.tar.xz latinime-c29ef3ec1553b30f5e6ad4ba21e505c09e019421.zip |
Remove unnecessary android:codes attribute
If there is no android:codes specified, the first character of
keyLabel's code point will be used instead.
Also introduce readable codes as @integer/key_XXX resources
Bug: 2973749
Change-Id: If9021ca35f9a7b922817e2099186fce0cd993652
Diffstat (limited to 'java/res/xml-fr')
-rw-r--r-- | java/res/xml-fr/kbd_qwerty.xml | 62 | ||||
-rw-r--r-- | java/res/xml-fr/kbd_qwerty_black.xml | 64 |
2 files changed, 35 insertions, 91 deletions
diff --git a/java/res/xml-fr/kbd_qwerty.xml b/java/res/xml-fr/kbd_qwerty.xml index e8d53481d..7a6c1ea07 100644 --- a/java/res/xml-fr/kbd_qwerty.xml +++ b/java/res/xml-fr/kbd_qwerty.xml @@ -27,89 +27,69 @@ > <Row> <Key - android:codes="97" android:keyLabel="a" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_a" android:keyEdgeFlags="left" /> <Key - android:codes="122" android:keyLabel="z" /> <Key - android:codes="101" android:keyLabel="e" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_e" /> <Key - android:codes="114" android:keyLabel="r" /> <Key - android:codes="116" android:keyLabel="t" /> <Key - android:codes="121" android:keyLabel="y" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_y" /> <Key - android:codes="117" android:keyLabel="u" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_u" /> <Key - android:codes="105" android:keyLabel="i" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_i" /> <Key - android:codes="111" android:keyLabel="o" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_o" /> <Key - android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right" /> </Row> <Row> <Key - android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left" /> <Key - android:codes="115" android:keyLabel="s" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_s" /> <Key - android:codes="100" android:keyLabel="d" /> <Key - android:codes="102" android:keyLabel="f" /> <Key - android:codes="103" android:keyLabel="g" /> <Key - android:codes="104" android:keyLabel="h" /> <Key - android:codes="106" android:keyLabel="j" /> <Key - android:codes="107" android:keyLabel="k" /> <Key - android:codes="108" android:keyLabel="l" /> <Key - android:codes="109" android:keyLabel="m" android:keyEdgeFlags="right" /> </Row> <Row> <Key - android:codes="-1" + android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_keyboard_shift" android:keyWidth="15%p" android:isModifier="true" @@ -117,24 +97,18 @@ android:isSticky="true" android:keyEdgeFlags="left" /> <Key - android:codes="119" android:keyLabel="w" /> <Key - android:codes="120" android:keyLabel="x" /> <Key - android:codes="99" android:keyLabel="c" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_c" /> <Key - android:codes="118" android:keyLabel="v" /> <Key - android:codes="98" android:keyLabel="b" /> <Key - android:codes="110" android:keyLabel="n" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_n" /> @@ -142,7 +116,7 @@ <Key android:keyLabel="\'" /> <Key - android:codes="-5" + android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_keyboard_delete" android:keyWidth="15%p" android:keyEdgeFlags="right" @@ -155,7 +129,7 @@ android:rowEdgeFlags="bottom" > <Key - android:codes="-2" + android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" android:keyEdgeFlags="left" @@ -173,20 +147,19 @@ android:keyWidth="10%p" android:isModifier="true" /> <Key - android:codes="32" + android:codes="@integer/key_space" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true" /> <Key - android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p" android:isModifier="true" /> <Key - android:codes="10" + android:codes="@integer/key_return" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" @@ -198,7 +171,7 @@ android:rowEdgeFlags="bottom" > <Key - android:codes="-2" + android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" android:keyEdgeFlags="left" @@ -214,7 +187,7 @@ android:keyWidth="10%p" android:isModifier="true" /> <Key - android:codes="32" + android:codes="@integer/key_space" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" @@ -226,7 +199,7 @@ android:keyWidth="10%p" android:isModifier="true" /> <Key - android:codes="10" + android:codes="@integer/key_return" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" @@ -238,7 +211,7 @@ android:rowEdgeFlags="bottom" > <Key - android:codes="-2" + android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" android:keyEdgeFlags="left" @@ -253,7 +226,7 @@ android:keyLabel="\@" android:isModifier="true" /> <Key - android:codes="32" + android:codes="@integer/key_space" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" @@ -264,7 +237,7 @@ android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true" /> <Key - android:codes="10" + android:codes="@integer/key_return" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" @@ -276,7 +249,7 @@ android:rowEdgeFlags="bottom" > <Key - android:codes="-2" + android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" android:keyEdgeFlags="left" @@ -294,14 +267,13 @@ android:keyWidth="10%p" android:isModifier="true" /> <Key - android:codes="32" + android:codes="@integer/key_space" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true" /> <Key - android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p" @@ -319,7 +291,7 @@ android:rowEdgeFlags="bottom" > <Key - android:codes="-2" + android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" android:keyEdgeFlags="left" @@ -337,14 +309,14 @@ android:keyWidth="10%p" android:isModifier="true" /> <Key - android:codes="32" + android:codes="@integer/key_space" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true" /> <Key - android:codes="9" + android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_keyboard_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:keyWidth="10%p" @@ -355,7 +327,7 @@ android:keyWidth="10%p" android:isModifier="true" /> <Key - android:codes="10" + android:codes="@integer/key_return" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="15%p" diff --git a/java/res/xml-fr/kbd_qwerty_black.xml b/java/res/xml-fr/kbd_qwerty_black.xml index 060998820..c8e314acc 100644 --- a/java/res/xml-fr/kbd_qwerty_black.xml +++ b/java/res/xml-fr/kbd_qwerty_black.xml @@ -27,89 +27,69 @@ > <Row> <Key - android:codes="97" android:keyLabel="a" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_a" android:keyEdgeFlags="left" /> <Key - android:codes="122" android:keyLabel="z" /> <Key - android:codes="101" android:keyLabel="e" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_e" /> <Key - android:codes="114" android:keyLabel="r" /> <Key - android:codes="116" android:keyLabel="t" /> <Key - android:codes="121" android:keyLabel="y" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_y" /> <Key - android:codes="117" android:keyLabel="u" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_u" /> <Key - android:codes="105" android:keyLabel="i" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_i" /> <Key - android:codes="111" android:keyLabel="o" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_o" /> <Key - android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right" /> </Row> <Row> <Key - android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left" /> <Key - android:codes="115" android:keyLabel="s" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_s" /> <Key - android:codes="100" android:keyLabel="d" /> <Key - android:codes="102" android:keyLabel="f" /> <Key - android:codes="103" android:keyLabel="g" /> <Key - android:codes="104" android:keyLabel="h" /> <Key - android:codes="106" android:keyLabel="j" /> <Key - android:codes="107" android:keyLabel="k" /> <Key - android:codes="108" android:keyLabel="l" /> <Key - android:codes="109" android:keyLabel="m" android:keyEdgeFlags="right" /> </Row> <Row> <Key - android:codes="-1" + android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_bkeyboard_shift" android:keyWidth="15%p" android:isModifier="true" @@ -117,24 +97,18 @@ android:isSticky="true" android:keyEdgeFlags="left" /> <Key - android:codes="119" android:keyLabel="w" /> <Key - android:codes="120" android:keyLabel="x" /> <Key - android:codes="99" android:keyLabel="c" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_c" /> <Key - android:codes="118" android:keyLabel="v" /> <Key - android:codes="98" android:keyLabel="b" /> <Key - android:codes="110" android:keyLabel="n" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_n" /> @@ -142,7 +116,7 @@ <Key android:keyLabel="\'" /> <Key - android:codes="-5" + android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_bkeyboard_delete" android:keyWidth="15%p" android:keyEdgeFlags="right" @@ -154,7 +128,7 @@ android:rowEdgeFlags="bottom" > <Key - android:codes="-2" + android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" android:keyEdgeFlags="left" /> @@ -169,18 +143,17 @@ android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p" /> <Key - android:codes="32" + android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" android:isRepeatable="true" /> <Key - android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p" /> <Key - android:codes="10" + android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" @@ -191,7 +164,7 @@ android:rowEdgeFlags="bottom" > <Key - android:codes="-2" + android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" android:keyEdgeFlags="left" /> @@ -204,7 +177,7 @@ android:keyLabel="/" android:keyWidth="10%p" /> <Key - android:codes="32" + android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" @@ -214,7 +187,7 @@ android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p" /> <Key - android:codes="10" + android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" @@ -225,7 +198,7 @@ android:rowEdgeFlags="bottom" > <Key - android:codes="-2" + android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" android:keyEdgeFlags="left" /> @@ -237,7 +210,7 @@ <Key android:keyLabel="\@" /> <Key - android:codes="32" + android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" @@ -246,7 +219,7 @@ android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" /> <Key - android:codes="10" + android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" @@ -257,7 +230,7 @@ android:rowEdgeFlags="bottom" > <Key - android:codes="-2" + android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" android:keyEdgeFlags="left" /> @@ -272,13 +245,12 @@ android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p" /> <Key - android:codes="32" + android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" android:isRepeatable="true" /> <Key - android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p" /> @@ -294,7 +266,7 @@ android:rowEdgeFlags="bottom" > <Key - android:codes="-2" + android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" android:keyEdgeFlags="left" /> @@ -309,13 +281,13 @@ android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p" /> <Key - android:codes="32" + android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" android:isRepeatable="true" /> <Key - android:codes="9" + android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_bkeyboard_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" android:keyWidth="10%p" /> @@ -324,10 +296,10 @@ android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p" /> <Key - android:codes="10" + android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="15%p" android:keyEdgeFlags="right" /> </Row> -</Keyboard>
\ No newline at end of file +</Keyboard> |