diff options
Diffstat (limited to 'java')
42 files changed, 1243 insertions, 875 deletions
diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal.9.png Binary files differnew file mode 100755 index 000000000..603bf0e15 --- /dev/null +++ b/java/res/drawable-land-hdpi/btn_keyboard_key_normal.9.png diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_off.9.png Binary files differnew file mode 100755 index 000000000..6ddd516e7 --- /dev/null +++ b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_off.9.png diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_normal_off_stone.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_off_stone.9.png Binary files differnew file mode 100644 index 000000000..67a204f85 --- /dev/null +++ b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_off_stone.9.png diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_on.9.png Binary files differnew file mode 100755 index 000000000..65fdeb353 --- /dev/null +++ b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_on.9.png diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_normal_on_stone.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_on_stone.9.png Binary files differnew file mode 100644 index 000000000..63cbe60a3 --- /dev/null +++ b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_on_stone.9.png diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_normal_stone.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_stone.9.png Binary files differnew file mode 100644 index 000000000..0dd33b429 --- /dev/null +++ b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_stone.9.png diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed.9.png Binary files differnew file mode 100755 index 000000000..7ec915fe8 --- /dev/null +++ b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed.9.png diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_off.9.png Binary files differnew file mode 100755 index 000000000..439271723 --- /dev/null +++ b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_off.9.png diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_on.9.png Binary files differnew file mode 100755 index 000000000..c2cc32044 --- /dev/null +++ b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_on.9.png diff --git a/java/res/drawable-land-hdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-land-hdpi/keyboard_suggest_strip_divider.png Binary files differnew file mode 100755 index 000000000..1a03c52e6 --- /dev/null +++ b/java/res/drawable-land-hdpi/keyboard_suggest_strip_divider.png diff --git a/java/res/values-da/donottranslate-altchars.xml b/java/res/values-da/donottranslate-altchars.xml index b1cc8b627..596994ca4 100644 --- a/java/res/values-da/donottranslate-altchars.xml +++ b/java/res/values-da/donottranslate-altchars.xml @@ -33,6 +33,8 @@ <string name="alternates_for_z">źžż</string> <string name="alternates_for_l">ł</string> <string name="alternates_for_v">w</string> - <string name="alternates_for_ae">ä</string> - <string name="alternates_for_oe">öœ</string> + <string name="keylabel_for_scandinavia_row2_10">æ</string> + <string name="keylabel_for_scandinavia_row2_11">ø</string> + <string name="alternates_for_scandinavia_row2_10">ä</string> + <string name="alternates_for_scandinavia_row2_11">öœ</string> </resources> diff --git a/java/res/values-nb/donottranslate-altchars.xml b/java/res/values-nb/donottranslate-altchars.xml index 6257dfc31..264402987 100644 --- a/java/res/values-nb/donottranslate-altchars.xml +++ b/java/res/values-nb/donottranslate-altchars.xml @@ -33,5 +33,8 @@ <string name="alternates_for_z">źžż</string> <string name="alternates_for_l">ł</string> <string name="alternates_for_v">w</string> - <string name="alternates_for_oe">œ</string> + <string name="keylabel_for_scandinavia_row2_10">ø</string> + <string name="keylabel_for_scandinavia_row2_11">æ</string> + <string name="alternates_for_scandinavia_row2_10">ö</string> + <string name="alternates_for_scandinavia_row2_11">ä</string> </resources> diff --git a/java/res/values-sv/donottranslate-altchars.xml b/java/res/values-sv/donottranslate-altchars.xml index 4d26e6c47..902a4c9bb 100644 --- a/java/res/values-sv/donottranslate-altchars.xml +++ b/java/res/values-sv/donottranslate-altchars.xml @@ -33,6 +33,8 @@ <string name="alternates_for_z">źžż</string> <string name="alternates_for_l">ł</string> <string name="alternates_for_v">w</string> - <string name="alternates_for_a_umlaut">æ</string> - <string name="alternates_for_o_umlaut">øœ</string> + <string name="keylabel_for_scandinavia_row2_10">ö</string> + <string name="keylabel_for_scandinavia_row2_11">ä</string> + <string name="alternates_for_scandinavia_row2_10">øœ</string> + <string name="alternates_for_scandinavia_row2_11">æ</string> </resources> diff --git a/java/res/values/donottranslate-altchars.xml b/java/res/values/donottranslate-altchars.xml index bba7282c9..41c498ee3 100644 --- a/java/res/values/donottranslate-altchars.xml +++ b/java/res/values/donottranslate-altchars.xml @@ -37,10 +37,10 @@ <string name="alternates_for_g"></string> <string name="alternates_for_p">0</string> <string name="alternates_for_v"></string> - <string name="alternates_for_ae"></string> - <string name="alternates_for_oe"></string> + <string name="keylabel_for_scandinavia_row2_10"></string> + <string name="keylabel_for_scandinavia_row2_11"></string> + <string name="alternates_for_scandinavia_row2_10"></string> + <string name="alternates_for_scandinavia_row2_11"></string> <string name="alternates_for_cyrillic_e"></string> <string name="alternates_for_cyrillic_soft_sign"></string> - <string name="alternates_for_a_umlaut"></string> - <string name="alternates_for_o_umlaut"></string> </resources> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 5daa98935..ff2209887 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -399,9 +399,9 @@ <string name="subtype_mode_en_US_keyboard">English (United States) Keyboard</string> <string name="subtype_mode_en_GB_keyboard">English (Great Britain) Keyboard</string> <string name="subtype_mode_es_keyboard">Spanish Keyboard</string> - <string name="subtype_mode_es_rUS_keyboard">Spanish (United States) Keyboard</string> + <string name="subtype_mode_es_US_keyboard">Spanish (United States) Keyboard</string> <string name="subtype_mode_fr_keyboard">French Keyboard</string> - <string name="subtype_mode_fr_rCA_keyboard">French (Canada) Keyboard</string> + <string name="subtype_mode_fr_CA_keyboard">French (Canada) Keyboard</string> <string name="subtype_mode_it_keyboard">Italian Keyboard</string> <string name="subtype_mode_nb_keyboard">Norwegian Keyboard</string> <string name="subtype_mode_nl_keyboard">Dutch Keyboard</string> diff --git a/java/res/xml-da/kbd_qwerty.xml b/java/res/xml-da/kbd_qwerty.xml index f1f9904e3..ac30b00bb 100644 --- a/java/res/xml-da/kbd_qwerty.xml +++ b/java/res/xml-da/kbd_qwerty.xml @@ -31,149 +31,6 @@ latin:verticalGap="@dimen/key_bottom_gap" latin:keyHeight="@dimen/key_height" > - <Row - latin:rowEdgeFlags="top" - > - <Key - latin:keyLabel="q" - latin:keyHintIcon="@drawable/keyboard_hint_1" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_q" - latin:keyWidth="8.75%p" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="w" - latin:keyHintIcon="@drawable/keyboard_hint_2" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_w" /> - <Key - latin:keyLabel="e" - latin:keyHintIcon="@drawable/keyboard_hint_3" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_e" /> - <Key - latin:keyLabel="r" - latin:keyHintIcon="@drawable/keyboard_hint_4" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_r" /> - <Key - latin:keyLabel="t" - latin:keyHintIcon="@drawable/keyboard_hint_5" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_t" /> - <Key - latin:keyLabel="y" - latin:keyHintIcon="@drawable/keyboard_hint_6" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_y" /> - <Key - latin:keyLabel="u" - latin:keyHintIcon="@drawable/keyboard_hint_7" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_u" /> - <Key - latin:keyLabel="i" - latin:keyHintIcon="@drawable/keyboard_hint_8" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_i" /> - <Key - latin:keyLabel="o" - latin:keyHintIcon="@drawable/keyboard_hint_9" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_o" /> - <Key - latin:keyLabel="p" - latin:keyHintIcon="@drawable/keyboard_hint_0" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_p" /> - <Key - latin:keyLabel="å" - latin:keyWidth="8.75%p" - latin:keyEdgeFlags="right" /> - </Row> - <Row> - <Key - latin:keyLabel="a" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_a" - latin:keyWidth="8.75%p" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="s" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_s" /> - <Key - latin:keyLabel="d" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_d" /> - <Key - latin:keyLabel="f" /> - <Key - latin:keyLabel="g" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_g" /> - <Key - latin:keyLabel="h" /> - <Key - latin:keyLabel="j" /> - <Key - latin:keyLabel="k" /> - <Key - latin:keyLabel="l" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_l" /> - <Key - latin:keyLabel="æ" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_ae" /> - <Key - latin:keyLabel="ø" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_oe" - latin:keyWidth="8.75%p" - latin:keyEdgeFlags="right" /> - </Row> - <Row - latin:keyWidth="10%p" - > - <Key - latin:codes="@integer/key_shift" - latin:keyIcon="@drawable/sym_keyboard_shift" - latin:iconPreview="@drawable/sym_keyboard_feedback_shift" - latin:keyWidth="15%p" - latin:isModifier="true" - latin:isSticky="true" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="z" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_z" /> - <Key - latin:keyLabel="x" /> - <Key - latin:keyLabel="c" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_c" /> - <Key - latin:keyLabel="v" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_v" /> - <Key - latin:keyLabel="b" /> - <Key - latin:keyLabel="n" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_n" /> - <Key - latin:keyLabel="m" /> - <Key - latin:codes="@integer/key_delete" - latin:keyIcon="@drawable/sym_keyboard_delete" - latin:iconPreview="@drawable/sym_keyboard_feedback_delete" - latin:keyWidth="15%p" - latin:isModifier="true" - latin:isRepeatable="true" - latin:keyEdgeFlags="right" /> - </Row> - <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> + <include + latin:keyboardLayout="@xml/kbd_qwerty_rows_scandinavia" /> </Keyboard> diff --git a/java/res/xml-de-xlarge/kbd_qwerty.xml b/java/res/xml-de-xlarge/kbd_qwerty.xml new file mode 100644 index 000000000..8e8e692cd --- /dev/null +++ b/java/res/xml-de-xlarge/kbd_qwerty.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2008, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<Keyboard + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + latin:keyWidth="10%p" + latin:horizontalGap="@dimen/key_horizontal_gap" + latin:verticalGap="@dimen/key_bottom_gap" + latin:keyHeight="@dimen/key_height" +> + <include + latin:keyboardLayout="@xml/kbd_qwertz_rows" /> +</Keyboard> diff --git a/java/res/xml-de/kbd_qwerty.xml b/java/res/xml-de/kbd_qwerty.xml index 0832cbc92..8e8e692cd 100644 --- a/java/res/xml-de/kbd_qwerty.xml +++ b/java/res/xml-de/kbd_qwerty.xml @@ -25,135 +25,6 @@ latin:verticalGap="@dimen/key_bottom_gap" latin:keyHeight="@dimen/key_height" > - <Row - latin:rowEdgeFlags="top" - > - <Key - latin:keyLabel="q" - latin:keyHintIcon="@drawable/keyboard_hint_1" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_q" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="w" - latin:keyHintIcon="@drawable/keyboard_hint_2" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_w" /> - <Key - latin:keyLabel="e" - latin:keyHintIcon="@drawable/keyboard_hint_3" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_e" /> - <Key - latin:keyLabel="r" - latin:keyHintIcon="@drawable/keyboard_hint_4" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_r" /> - <Key - latin:keyLabel="t" - latin:keyHintIcon="@drawable/keyboard_hint_5" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_t" /> - <Key - latin:keyLabel="z" - latin:keyHintIcon="@drawable/keyboard_hint_6" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_z" /> - <Key - latin:keyLabel="u" - latin:keyHintIcon="@drawable/keyboard_hint_7" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_u" /> - <Key - latin:keyLabel="i" - latin:keyHintIcon="@drawable/keyboard_hint_8" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_i" /> - <Key - latin:keyLabel="o" - latin:keyHintIcon="@drawable/keyboard_hint_9" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_o" /> - <Key - latin:keyLabel="p" - latin:keyHintIcon="@drawable/keyboard_hint_0" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_p" - latin:keyEdgeFlags="right" /> - </Row> - <Row> - <Spacer - latin:horizontalGap="5%p" /> - <Key - latin:keyLabel="a" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_a" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="s" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_s" /> - <Key - latin:keyLabel="d" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_d" /> - <Key - latin:keyLabel="f" /> - <Key - latin:keyLabel="g" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_g" /> - <Key - latin:keyLabel="h" /> - <Key - latin:keyLabel="j" /> - <Key - latin:keyLabel="k" /> - <Key - latin:keyLabel="l" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_l" - latin:keyEdgeFlags="right" /> - </Row> - <Row> - <Key - latin:codes="@integer/key_shift" - latin:keyIcon="@drawable/sym_keyboard_shift" - latin:iconPreview="@drawable/sym_keyboard_feedback_shift" - latin:keyWidth="15%p" - latin:isModifier="true" - latin:isSticky="true" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="y" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_y" /> - <Key - latin:keyLabel="x" /> - <Key - latin:keyLabel="c" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_c" /> - <Key - latin:keyLabel="v" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_v" /> - <Key - latin:keyLabel="b" /> - <Key - latin:keyLabel="n" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_n" /> - <Key - latin:keyLabel="m" /> - <Key - latin:codes="@integer/key_delete" - latin:keyIcon="@drawable/sym_keyboard_delete" - latin:iconPreview="@drawable/sym_keyboard_feedback_delete" - latin:keyWidth="15%p" - latin:isModifier="true" - latin:isRepeatable="true" - latin:keyEdgeFlags="right" /> - </Row> - <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> + <include + latin:keyboardLayout="@xml/kbd_qwertz_rows" /> </Keyboard> diff --git a/java/res/xml-fr-rCA-xlarge/kbd_qwerty.xml b/java/res/xml-fr-rCA-xlarge/kbd_qwerty.xml new file mode 100644 index 000000000..42f151560 --- /dev/null +++ b/java/res/xml-fr-rCA-xlarge/kbd_qwerty.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2008, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<Keyboard + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + latin:keyWidth="10%p" + latin:horizontalGap="@dimen/key_horizontal_gap" + latin:verticalGap="@dimen/key_bottom_gap" + latin:keyHeight="@dimen/key_height" +> + <include + latin:keyboardLayout="@xml/kbd_qwerty_rows" /> +</Keyboard> diff --git a/java/res/xml-fr-rCA/kbd_qwerty.xml b/java/res/xml-fr-rCA/kbd_qwerty.xml new file mode 100644 index 000000000..42f151560 --- /dev/null +++ b/java/res/xml-fr-rCA/kbd_qwerty.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2008, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<Keyboard + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + latin:keyWidth="10%p" + latin:horizontalGap="@dimen/key_horizontal_gap" + latin:verticalGap="@dimen/key_bottom_gap" + latin:keyHeight="@dimen/key_height" +> + <include + latin:keyboardLayout="@xml/kbd_qwerty_rows" /> +</Keyboard> diff --git a/java/res/xml-fr-rCH-xlarge/kbd_qwerty.xml b/java/res/xml-fr-rCH-xlarge/kbd_qwerty.xml new file mode 100644 index 000000000..8e8e692cd --- /dev/null +++ b/java/res/xml-fr-rCH-xlarge/kbd_qwerty.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2008, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<Keyboard + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + latin:keyWidth="10%p" + latin:horizontalGap="@dimen/key_horizontal_gap" + latin:verticalGap="@dimen/key_bottom_gap" + latin:keyHeight="@dimen/key_height" +> + <include + latin:keyboardLayout="@xml/kbd_qwertz_rows" /> +</Keyboard> diff --git a/java/res/xml-fr-rCH/kbd_qwerty.xml b/java/res/xml-fr-rCH/kbd_qwerty.xml new file mode 100644 index 000000000..8e8e692cd --- /dev/null +++ b/java/res/xml-fr-rCH/kbd_qwerty.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2008, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<Keyboard + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + latin:keyWidth="10%p" + latin:horizontalGap="@dimen/key_horizontal_gap" + latin:verticalGap="@dimen/key_bottom_gap" + latin:keyHeight="@dimen/key_height" +> + <include + latin:keyboardLayout="@xml/kbd_qwertz_rows" /> +</Keyboard> diff --git a/java/res/xml-fr-xlarge/kbd_qwerty.xml b/java/res/xml-fr-xlarge/kbd_qwerty.xml new file mode 100644 index 000000000..8d68a554b --- /dev/null +++ b/java/res/xml-fr-xlarge/kbd_qwerty.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2008, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<Keyboard + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + latin:keyWidth="10%p" + latin:horizontalGap="@dimen/key_horizontal_gap" + latin:verticalGap="@dimen/key_bottom_gap" + latin:keyHeight="@dimen/key_height" +> + <include + latin:keyboardLayout="@xml/kbd_azerty_rows" /> +</Keyboard> diff --git a/java/res/xml-fr/kbd_qwerty.xml b/java/res/xml-fr/kbd_qwerty.xml index 95c107382..8d68a554b 100644 --- a/java/res/xml-fr/kbd_qwerty.xml +++ b/java/res/xml-fr/kbd_qwerty.xml @@ -25,135 +25,6 @@ latin:verticalGap="@dimen/key_bottom_gap" latin:keyHeight="@dimen/key_height" > - <Row - latin:rowEdgeFlags="top" - > - <Key - latin:keyLabel="a" - latin:keyHintIcon="@drawable/keyboard_hint_1" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_a" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="z" - latin:keyHintIcon="@drawable/keyboard_hint_2" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_z" /> - <Key - latin:keyLabel="e" - latin:keyHintIcon="@drawable/keyboard_hint_3" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_e" /> - <Key - latin:keyLabel="r" - latin:keyHintIcon="@drawable/keyboard_hint_4" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_r" /> - <Key - latin:keyLabel="t" - latin:keyHintIcon="@drawable/keyboard_hint_5" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_t" /> - <Key - latin:keyLabel="y" - latin:keyHintIcon="@drawable/keyboard_hint_6" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_y" /> - <Key - latin:keyLabel="u" - latin:keyHintIcon="@drawable/keyboard_hint_7" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_u" /> - <Key - latin:keyLabel="i" - latin:keyHintIcon="@drawable/keyboard_hint_8" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_i" /> - <Key - latin:keyLabel="o" - latin:keyHintIcon="@drawable/keyboard_hint_9" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_o" /> - <Key - latin:keyLabel="p" - latin:keyHintIcon="@drawable/keyboard_hint_0" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_p" - latin:keyEdgeFlags="right" /> - </Row> - <Row> - <Key - latin:keyLabel="q" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_q" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="s" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_s" /> - <Key - latin:keyLabel="d" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_d" /> - <Key - latin:keyLabel="f" /> - <Key - latin:keyLabel="g" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_g" /> - <Key - latin:keyLabel="h" /> - <Key - latin:keyLabel="j" /> - <Key - latin:keyLabel="k" /> - <Key - latin:keyLabel="l" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_l" /> - <Key - latin:keyLabel="m" - latin:keyEdgeFlags="right" /> - </Row> - <Row> - <Key - latin:codes="@integer/key_shift" - latin:keyIcon="@drawable/sym_keyboard_shift" - latin:iconPreview="@drawable/sym_keyboard_feedback_shift" - latin:keyWidth="15%p" - latin:isModifier="true" - latin:isSticky="true" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="w" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_w" /> - <Key - latin:keyLabel="x" /> - <Key - latin:keyLabel="c" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_c" /> - <Key - latin:keyLabel="v" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_v" /> - <Key - latin:keyLabel="b" /> - <Key - latin:keyLabel="n" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_n" /> - <Key - latin:keyLabel="\'" /> - <Key - latin:codes="@integer/key_delete" - latin:keyIcon="@drawable/sym_keyboard_delete" - latin:iconPreview="@drawable/sym_keyboard_feedback_delete" - latin:keyWidth="15%p" - latin:isModifier="true" - latin:isRepeatable="true" - latin:keyEdgeFlags="right" /> - </Row> - <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> + <include + latin:keyboardLayout="@xml/kbd_azerty_rows" /> </Keyboard> diff --git a/java/res/xml-iw/kbd_qwerty.xml b/java/res/xml-iw/kbd_qwerty.xml index fd94a1202..514f93572 100644 --- a/java/res/xml-iw/kbd_qwerty.xml +++ b/java/res/xml-iw/kbd_qwerty.xml @@ -25,6 +25,8 @@ latin:verticalGap="@dimen/key_bottom_gap" latin:keyHeight="@dimen/key_height" > + <include + latin:keyboardLayout="@xml/kbd_key_styles" /> <Row latin:rowEdgeFlags="top" > @@ -50,12 +52,8 @@ <Spacer latin:horizontalGap="1.25%p" /> <Key - latin:codes="@integer/key_delete" - latin:keyIcon="@drawable/sym_keyboard_delete" - latin:iconPreview="@drawable/sym_keyboard_feedback_delete" + latin:keyStyle="deleteKeyStyle" latin:keyWidth="13.75%p" - latin:isModifier="true" - latin:isRepeatable="true" latin:keyEdgeFlags="right" /> </Row> <Row> diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml index 32512daaa..fe33e5384 100644 --- a/java/res/xml-nb/kbd_qwerty.xml +++ b/java/res/xml-nb/kbd_qwerty.xml @@ -31,149 +31,6 @@ latin:verticalGap="@dimen/key_bottom_gap" latin:keyHeight="@dimen/key_height" > - <Row - latin:rowEdgeFlags="top" - > - <Key - latin:keyLabel="q" - latin:keyHintIcon="@drawable/keyboard_hint_1" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_q" - latin:keyWidth="8.75%p" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="w" - latin:keyHintIcon="@drawable/keyboard_hint_2" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_w" /> - <Key - latin:keyLabel="e" - latin:keyHintIcon="@drawable/keyboard_hint_3" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_e" /> - <Key - latin:keyLabel="r" - latin:keyHintIcon="@drawable/keyboard_hint_4" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_r" /> - <Key - latin:keyLabel="t" - latin:keyHintIcon="@drawable/keyboard_hint_5" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_t" /> - <Key - latin:keyLabel="y" - latin:keyHintIcon="@drawable/keyboard_hint_6" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_y" /> - <Key - latin:keyLabel="u" - latin:keyHintIcon="@drawable/keyboard_hint_7" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_u" /> - <Key - latin:keyLabel="i" - latin:keyHintIcon="@drawable/keyboard_hint_8" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_i" /> - <Key - latin:keyLabel="o" - latin:keyHintIcon="@drawable/keyboard_hint_9" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_o" /> - <Key - latin:keyLabel="p" - latin:keyHintIcon="@drawable/keyboard_hint_0" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_p" /> - <Key - latin:keyLabel="å" - latin:keyWidth="8.75%p" - latin:keyEdgeFlags="right" /> - </Row> - <Row> - <Key - latin:keyLabel="a" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_a" - latin:keyWidth="8.75%p" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="s" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_s" /> - <Key - latin:keyLabel="d" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_d" /> - <Key - latin:keyLabel="f" /> - <Key - latin:keyLabel="g" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_g" /> - <Key - latin:keyLabel="h" /> - <Key - latin:keyLabel="j" /> - <Key - latin:keyLabel="k" /> - <Key - latin:keyLabel="l" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_l" /> - <Key - latin:keyLabel="ø" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_oe" /> - <Key - latin:keyLabel="æ" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_ae" - latin:keyWidth="8.75%p" - latin:keyEdgeFlags="right" /> - </Row> - <Row - latin:keyWidth="10%p" - > - <Key - latin:codes="@integer/key_shift" - latin:keyIcon="@drawable/sym_keyboard_shift" - latin:iconPreview="@drawable/sym_keyboard_feedback_shift" - latin:keyWidth="15%p" - latin:isModifier="true" - latin:isSticky="true" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="z" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_z" /> - <Key - latin:keyLabel="x" /> - <Key - latin:keyLabel="c" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_c" /> - <Key - latin:keyLabel="v" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_v" /> - <Key - latin:keyLabel="b" /> - <Key - latin:keyLabel="n" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_n" /> - <Key - latin:keyLabel="m" /> - <Key - latin:codes="@integer/key_delete" - latin:keyIcon="@drawable/sym_keyboard_delete" - latin:iconPreview="@drawable/sym_keyboard_feedback_delete" - latin:keyWidth="15%p" - latin:isModifier="true" - latin:isRepeatable="true" - latin:keyEdgeFlags="right" /> - </Row> - <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> + <include + latin:keyboardLayout="@xml/kbd_qwerty_rows_scandinavia" /> </Keyboard> diff --git a/java/res/xml-ru/kbd_qwerty.xml b/java/res/xml-ru/kbd_qwerty.xml index 80a9ddd4f..d5744c94e 100644 --- a/java/res/xml-ru/kbd_qwerty.xml +++ b/java/res/xml-ru/kbd_qwerty.xml @@ -25,6 +25,8 @@ latin:verticalGap="@dimen/key_bottom_gap" latin:keyHeight="@dimen/key_height" > + <include + latin:keyboardLayout="@xml/kbd_key_styles" /> <Row latin:rowEdgeFlags="top" > @@ -117,12 +119,8 @@ latin:keyWidth="8.5%p" > <Key - latin:codes="@integer/key_shift" - latin:keyIcon="@drawable/sym_keyboard_shift" - latin:iconPreview="@drawable/sym_keyboard_feedback_shift" + latin:keyStyle="shiftKeyStyle" latin:keyWidth="11.75%p" - latin:isModifier="true" - latin:isSticky="true" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="я" /> @@ -145,13 +143,10 @@ <Key latin:keyLabel="ю" /> <Key - latin:codes="@integer/key_delete" - latin:keyIcon="@drawable/sym_keyboard_delete" - latin:iconPreview="@drawable/sym_keyboard_feedback_delete" + latin:keyStyle="deleteKeyStyle" latin:keyWidth="11.75%p" - latin:isModifier="true" - latin:isRepeatable="true" latin:keyEdgeFlags="right" /> </Row> - <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row4" /> </Keyboard> diff --git a/java/res/xml-sr/kbd_qwerty.xml b/java/res/xml-sr/kbd_qwerty.xml index c9a4e449c..77e764788 100644 --- a/java/res/xml-sr/kbd_qwerty.xml +++ b/java/res/xml-sr/kbd_qwerty.xml @@ -26,6 +26,8 @@ latin:verticalGap="@dimen/key_bottom_gap" latin:keyHeight="@dimen/key_height" > + <include + latin:keyboardLayout="@xml/kbd_key_styles" /> <Row latin:rowEdgeFlags="top" > @@ -116,12 +118,8 @@ latin:keyWidth="8.5%p" > <Key - latin:codes="@integer/key_shift" - latin:keyIcon="@drawable/sym_keyboard_shift" - latin:iconPreview="@drawable/sym_keyboard_feedback_shift" + latin:keyStyle="shiftKeyStyle" latin:keyWidth="11.75%p" - latin:isModifier="true" - latin:isSticky="true" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="ж" /> @@ -138,13 +136,10 @@ <Key latin:keyLabel="м" /> <Key - latin:codes="@integer/key_delete" - latin:keyIcon="@drawable/sym_keyboard_delete" - latin:iconPreview="@drawable/sym_keyboard_feedback_delete" + latin:keyStyle="deleteKeyStyle" latin:keyWidth="11.75%p" - latin:isModifier="true" - latin:isRepeatable="true" latin:keyEdgeFlags="right" /> </Row> - <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row4" /> </Keyboard> diff --git a/java/res/xml-sv/kbd_qwerty.xml b/java/res/xml-sv/kbd_qwerty.xml index ae7002463..464a463a1 100644 --- a/java/res/xml-sv/kbd_qwerty.xml +++ b/java/res/xml-sv/kbd_qwerty.xml @@ -33,148 +33,6 @@ latin:verticalGap="@dimen/key_bottom_gap" latin:keyHeight="@dimen/key_height" > - <Row - latin:rowEdgeFlags="top" - > - <Key - latin:keyLabel="q" - latin:keyHintIcon="@drawable/keyboard_hint_1" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_q" - latin:keyWidth="8.75%p" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="w" - latin:keyHintIcon="@drawable/keyboard_hint_2" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_w" /> - <Key - latin:keyLabel="e" - latin:keyHintIcon="@drawable/keyboard_hint_3" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_e" /> - <Key - latin:keyLabel="r" - latin:keyHintIcon="@drawable/keyboard_hint_4" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_r" /> - <Key - latin:keyLabel="t" - latin:keyHintIcon="@drawable/keyboard_hint_5" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_t" /> - <Key - latin:keyLabel="y" - latin:keyHintIcon="@drawable/keyboard_hint_6" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_y" /> - <Key - latin:keyLabel="u" - latin:keyHintIcon="@drawable/keyboard_hint_7" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_u" /> - <Key - latin:keyLabel="i" - latin:keyHintIcon="@drawable/keyboard_hint_8" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_i" /> - <Key - latin:keyLabel="o" - latin:keyHintIcon="@drawable/keyboard_hint_9" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_o" /> - <Key - latin:keyLabel="p" - latin:keyHintIcon="@drawable/keyboard_hint_0" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_p" /> - <Key - latin:keyLabel="å" - latin:keyWidth="8.75%p" - latin:keyEdgeFlags="right" /> - </Row> - <Row> - <Key - latin:keyLabel="a" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_a" - latin:keyWidth="8.75%p" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="s" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_s" /> - <Key - latin:keyLabel="d" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_d" /> - <Key - latin:keyLabel="f" /> - <Key - latin:keyLabel="g" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_g" /> - <Key - latin:keyLabel="h" /> - <Key - latin:keyLabel="j" /> - <Key - latin:keyLabel="k" /> - <Key - latin:keyLabel="l" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_l" /> - <Key - latin:keyLabel="ö" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_o_umlaut" /> - <Key - latin:keyLabel="ä" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_a_umlaut" - latin:keyWidth="8.75%p" - latin:keyEdgeFlags="right" /> - </Row> - <Row - latin:keyWidth="10%p" - > - <Key - latin:codes="@integer/key_shift" - latin:keyIcon="@drawable/sym_keyboard_shift" - latin:iconPreview="@drawable/sym_keyboard_feedback_shift" - latin:keyWidth="15%p" - latin:isModifier="true" - latin:isSticky="true" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="z" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_z" /> - <Key - latin:keyLabel="x" /> - <Key - latin:keyLabel="c" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_c" /> - <Key - latin:keyLabel="v" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_v" /> - <Key - latin:keyLabel="b" /> - <Key - latin:keyLabel="n" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_n" /> - <Key - latin:keyLabel="m" /> - <Key - latin:codes="@integer/key_delete" - latin:keyIcon="@drawable/sym_keyboard_delete" - latin:iconPreview="@drawable/sym_keyboard_feedback_delete" - latin:keyWidth="15%p" - latin:isRepeatable="true" - latin:keyEdgeFlags="right" /> - </Row> - <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> + <include + latin:keyboardLayout="@xml/kbd_qwerty_rows_scandinavia" /> </Keyboard> diff --git a/java/res/xml-xlarge/kbd_azerty_rows.xml b/java/res/xml-xlarge/kbd_azerty_rows.xml new file mode 100644 index 000000000..b68e21481 --- /dev/null +++ b/java/res/xml-xlarge/kbd_azerty_rows.xml @@ -0,0 +1,190 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/kbd_key_styles" /> + <Row + latin:keyWidth="8.272%p" + > + <Key + latin:keyStyle="tabKeyStyle" + latin:keyLabelOption="alignLeft" + latin:keyWidth="7.949%p" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="a" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_a" /> + <Key + latin:keyLabel="z" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_z" /> + <Key + latin:keyLabel="e" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_e" /> + <Key + latin:keyLabel="r" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_r" /> + <Key + latin:keyLabel="t" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_t" /> + <Key + latin:keyLabel="y" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_y" /> + <Key + latin:keyLabel="u" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_u" /> + <Key + latin:keyLabel="i" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_i" /> + <Key + latin:keyLabel="o" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_o" /> + <Key + latin:keyLabel="p" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_p" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="9.331%p" + latin:keyEdgeFlags="right" /> + </Row> + <Row + latin:keyWidth="8.157%p" + > + <Key + latin:keyStyle="toSymbolKeyStyle" + latin:keyLabelOption="alignLeft" + latin:keyWidth="10.167%p" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="q" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_q" /> + <Key + latin:keyLabel="s" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_s" /> + <Key + latin:keyLabel="d" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_d" /> + <Key + latin:keyLabel="f" /> + <Key + latin:keyLabel="g" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_g" /> + <Key + latin:keyLabel="h" /> + <Key + latin:keyLabel="j" /> + <Key + latin:keyLabel="k" /> + <Key + latin:keyLabel="l" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_l" /> + <Key + latin:keyLabel="m" + latin:keyEdgeFlags="right" /> + <Key + latin:keyStyle="returnKeyStyle" + latin:keyWidth="8.593%p" + latin:keyEdgeFlags="right" /> + </Row> + <Row + latin:keyWidth="8.042%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="15.192%p" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="w" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_w" /> + <Key + latin:keyLabel="x" /> + <Key + latin:keyLabel="c" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_c" /> + <Key + latin:keyLabel="v" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_v" /> + <Key + latin:keyLabel="b" /> + <Key + latin:keyLabel="n" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_n" /> + <Key + latin:keyLabel="\'" + latin:manualTemporaryUpperCaseCode="58" + latin:keyHintIcon="@drawable/key_hint_colon_holo" + latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters=":" /> + <switch> + <case + latin:mode="email" + > + <Key + latin:keyLabel="," /> + <Key + latin:keyLabel="." /> + </case> + <default> + <Key + latin:keyLabel="," + latin:manualTemporaryUpperCaseCode="33" + latin:keyHintIcon="@drawable/key_hint_exclamation_holo" + latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="!" /> + <Key + latin:keyLabel="." + latin:manualTemporaryUpperCaseCode="63" + latin:keyHintIcon="@drawable/key_hint_question_holo" + latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="\?" /> + </default> + </switch> + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="12.530%p" + latin:keyEdgeFlags="right" /> + </Row> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row4" /> +</merge> diff --git a/java/res/xml-xlarge/kbd_qwerty.xml b/java/res/xml-xlarge/kbd_qwerty.xml index 6f6877b0b..56cfe000e 100644 --- a/java/res/xml-xlarge/kbd_qwerty.xml +++ b/java/res/xml-xlarge/kbd_qwerty.xml @@ -25,13 +25,5 @@ latin:keyHeight="@dimen/key_height" > <include - latin:keyboardLayout="@xml/kbd_key_styles" /> - <include - latin:keyboardLayout="@xml/kbd_qwerty_row1" /> - <include - latin:keyboardLayout="@xml/kbd_qwerty_row2" /> - <include - latin:keyboardLayout="@xml/kbd_qwerty_row3" /> - <include - latin:keyboardLayout="@xml/kbd_qwerty_row4" /> + latin:keyboardLayout="@xml/kbd_qwerty_rows" /> </Keyboard> diff --git a/java/res/xml-xlarge/kbd_qwerty_rows.xml b/java/res/xml-xlarge/kbd_qwerty_rows.xml new file mode 100644 index 000000000..6237712f6 --- /dev/null +++ b/java/res/xml-xlarge/kbd_qwerty_rows.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/kbd_key_styles" /> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row1" /> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row2" /> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row3" /> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row4" /> +</merge> diff --git a/java/res/xml-xlarge/kbd_qwertz_rows.xml b/java/res/xml-xlarge/kbd_qwertz_rows.xml new file mode 100644 index 000000000..de15b5fd6 --- /dev/null +++ b/java/res/xml-xlarge/kbd_qwertz_rows.xml @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/kbd_key_styles" /> + <Row + latin:keyWidth="8.272%p" + > + <Key + latin:keyStyle="tabKeyStyle" + latin:keyLabelOption="alignLeft" + latin:keyWidth="7.949%p" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="q" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_q" /> + <Key + latin:keyLabel="w" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_w" /> + <Key + latin:keyLabel="e" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_e" /> + <Key + latin:keyLabel="r" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_r" /> + <Key + latin:keyLabel="t" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_t" /> + <Key + latin:keyLabel="z" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_z" /> + <Key + latin:keyLabel="u" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_u" /> + <Key + latin:keyLabel="i" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_i" /> + <Key + latin:keyLabel="o" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_o" /> + <Key + latin:keyLabel="p" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_p" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="9.331%p" + latin:keyEdgeFlags="right" /> + </Row> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row2" /> + <Row + latin:keyWidth="8.042%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="15.192%p" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="y" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_y" /> + <Key + latin:keyLabel="x" /> + <Key + latin:keyLabel="c" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_c" /> + <Key + latin:keyLabel="v" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_v" /> + <Key + latin:keyLabel="b" /> + <Key + latin:keyLabel="n" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_n" /> + <Key + latin:keyLabel="m" /> + <switch> + <case + latin:mode="email" + > + <Key + latin:keyLabel="," /> + <Key + latin:keyLabel="." /> + </case> + <default> + <Key + latin:keyLabel="," + latin:manualTemporaryUpperCaseCode="33" + latin:keyHintIcon="@drawable/key_hint_exclamation_holo" + latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="!" /> + <Key + latin:keyLabel="." + latin:manualTemporaryUpperCaseCode="63" + latin:keyHintIcon="@drawable/key_hint_question_holo" + latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="\?" /> + </default> + </switch> + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="12.530%p" + latin:keyEdgeFlags="right" /> + </Row> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row4" /> +</merge> diff --git a/java/res/xml/kbd_azerty_rows.xml b/java/res/xml/kbd_azerty_rows.xml new file mode 100644 index 000000000..c06724c49 --- /dev/null +++ b/java/res/xml/kbd_azerty_rows.xml @@ -0,0 +1,155 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/kbd_key_styles" /> + <Row + latin:keyWidth="10%p" + latin:rowEdgeFlags="top" + > + <Key + latin:keyLabel="a" + latin:keyHintIcon="@drawable/keyboard_hint_1" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_a" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="z" + latin:keyHintIcon="@drawable/keyboard_hint_2" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_z" /> + <Key + latin:keyLabel="e" + latin:keyHintIcon="@drawable/keyboard_hint_3" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_e" /> + <Key + latin:keyLabel="r" + latin:keyHintIcon="@drawable/keyboard_hint_4" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_r" /> + <Key + latin:keyLabel="t" + latin:keyHintIcon="@drawable/keyboard_hint_5" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_t" /> + <Key + latin:keyLabel="y" + latin:keyHintIcon="@drawable/keyboard_hint_6" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_y" /> + <Key + latin:keyLabel="u" + latin:keyHintIcon="@drawable/keyboard_hint_7" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_u" /> + <Key + latin:keyLabel="i" + latin:keyHintIcon="@drawable/keyboard_hint_8" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_i" /> + <Key + latin:keyLabel="o" + latin:keyHintIcon="@drawable/keyboard_hint_9" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_o" /> + <Key + latin:keyLabel="p" + latin:keyHintIcon="@drawable/keyboard_hint_0" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_p" + latin:keyEdgeFlags="right" /> + </Row> + <Row + latin:keyWidth="10%p" + > + <Key + latin:keyLabel="q" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_q" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="s" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_s" /> + <Key + latin:keyLabel="d" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_d" /> + <Key + latin:keyLabel="f" /> + <Key + latin:keyLabel="g" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_g" /> + <Key + latin:keyLabel="h" /> + <Key + latin:keyLabel="j" /> + <Key + latin:keyLabel="k" /> + <Key + latin:keyLabel="l" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_l" /> + <Key + latin:keyLabel="m" + latin:keyEdgeFlags="right" /> + </Row> + <Row + latin:keyWidth="10%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="15%p" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="w" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_w" /> + <Key + latin:keyLabel="x" /> + <Key + latin:keyLabel="c" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_c" /> + <Key + latin:keyLabel="v" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_v" /> + <Key + latin:keyLabel="b" /> + <Key + latin:keyLabel="n" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_n" /> + <Key + latin:keyLabel="\'" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="15%p" + latin:keyEdgeFlags="right" /> + </Row> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row4" /> +</merge> diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml index b75f53399..42f151560 100644 --- a/java/res/xml/kbd_qwerty.xml +++ b/java/res/xml/kbd_qwerty.xml @@ -26,129 +26,5 @@ latin:keyHeight="@dimen/key_height" > <include - latin:keyboardLayout="@xml/kbd_key_styles" /> - <Row - latin:rowEdgeFlags="top" - > - <Key - latin:keyLabel="q" - latin:keyHintIcon="@drawable/keyboard_hint_1" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_q" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="w" - latin:keyHintIcon="@drawable/keyboard_hint_2" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_w" /> - <Key - latin:keyLabel="e" - latin:keyHintIcon="@drawable/keyboard_hint_3" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_e" /> - <Key - latin:keyLabel="r" - latin:keyHintIcon="@drawable/keyboard_hint_4" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_r" /> - <Key - latin:keyLabel="t" - latin:keyHintIcon="@drawable/keyboard_hint_5" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_t" /> - <Key - latin:keyLabel="y" - latin:keyHintIcon="@drawable/keyboard_hint_6" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_y" /> - <Key - latin:keyLabel="u" - latin:keyHintIcon="@drawable/keyboard_hint_7" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_u" /> - <Key - latin:keyLabel="i" - latin:keyHintIcon="@drawable/keyboard_hint_8" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_i" /> - <Key - latin:keyLabel="o" - latin:keyHintIcon="@drawable/keyboard_hint_9" - latin:popupKeyboard="@xml/kbd_popup_narrow_template" - latin:popupCharacters="@string/alternates_for_o" /> - <Key - latin:keyLabel="p" - latin:keyHintIcon="@drawable/keyboard_hint_0" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_p" - latin:keyEdgeFlags="right" /> - </Row> - <Row> - <Spacer - latin:horizontalGap="5%p" /> - <Key - latin:keyLabel="a" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_a" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="s" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_s" /> - <Key - latin:keyLabel="d" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_d" /> - <Key - latin:keyLabel="f" /> - <Key - latin:keyLabel="g" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_g" /> - <Key - latin:keyLabel="h" /> - <Key - latin:keyLabel="j" /> - <Key - latin:keyLabel="k" /> - <Key - latin:keyLabel="l" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_l" - latin:keyEdgeFlags="right" /> - </Row> - <Row> - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyWidth="15%p" - latin:keyEdgeFlags="left" /> - <Key - latin:keyLabel="z" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_z" /> - <Key - latin:keyLabel="x" /> - <Key - latin:keyLabel="c" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_c" /> - <Key - latin:keyLabel="v" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_v" /> - <Key - latin:keyLabel="b" /> - <Key - latin:keyLabel="n" - latin:popupKeyboard="@xml/kbd_popup_template" - latin:popupCharacters="@string/alternates_for_n" /> - <Key - latin:keyLabel="m" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="15%p" - latin:keyEdgeFlags="right" /> - </Row> - <include - latin:keyboardLayout="@xml/kbd_qwerty_row4" /> + latin:keyboardLayout="@xml/kbd_qwerty_rows" /> </Keyboard> diff --git a/java/res/xml/kbd_qwerty_row1.xml b/java/res/xml/kbd_qwerty_row1.xml new file mode 100644 index 000000000..e4356a8ad --- /dev/null +++ b/java/res/xml/kbd_qwerty_row1.xml @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <Row + latin:keyWidth="10%p" + latin:rowEdgeFlags="top" + > + <Key + latin:keyLabel="q" + latin:keyHintIcon="@drawable/keyboard_hint_1" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_q" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="w" + latin:keyHintIcon="@drawable/keyboard_hint_2" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_w" /> + <Key + latin:keyLabel="e" + latin:keyHintIcon="@drawable/keyboard_hint_3" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_e" /> + <Key + latin:keyLabel="r" + latin:keyHintIcon="@drawable/keyboard_hint_4" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_r" /> + <Key + latin:keyLabel="t" + latin:keyHintIcon="@drawable/keyboard_hint_5" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_t" /> + <Key + latin:keyLabel="y" + latin:keyHintIcon="@drawable/keyboard_hint_6" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_y" /> + <Key + latin:keyLabel="u" + latin:keyHintIcon="@drawable/keyboard_hint_7" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_u" /> + <Key + latin:keyLabel="i" + latin:keyHintIcon="@drawable/keyboard_hint_8" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_i" /> + <Key + latin:keyLabel="o" + latin:keyHintIcon="@drawable/keyboard_hint_9" + latin:popupKeyboard="@xml/kbd_popup_narrow_template" + latin:popupCharacters="@string/alternates_for_o" /> + <Key + latin:keyLabel="p" + latin:keyHintIcon="@drawable/keyboard_hint_0" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_p" + latin:keyEdgeFlags="right" /> + </Row> +</merge> diff --git a/java/res/xml/kbd_qwerty_row2.xml b/java/res/xml/kbd_qwerty_row2.xml new file mode 100644 index 000000000..d5184954f --- /dev/null +++ b/java/res/xml/kbd_qwerty_row2.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <Row + latin:keyWidth="10%p" + > + <Spacer + latin:horizontalGap="5%p" /> + <Key + latin:keyLabel="a" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_a" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="s" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_s" /> + <Key + latin:keyLabel="d" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_d" /> + <Key + latin:keyLabel="f" /> + <Key + latin:keyLabel="g" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_g" /> + <Key + latin:keyLabel="h" /> + <Key + latin:keyLabel="j" /> + <Key + latin:keyLabel="k" /> + <Key + latin:keyLabel="l" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_l" + latin:keyEdgeFlags="right" /> + </Row> +</merge> diff --git a/java/res/xml/kbd_qwerty_row3.xml b/java/res/xml/kbd_qwerty_row3.xml new file mode 100644 index 000000000..71a5f9c4a --- /dev/null +++ b/java/res/xml/kbd_qwerty_row3.xml @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <Row + latin:keyWidth="10%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="15%p" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="z" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_z" /> + <Key + latin:keyLabel="x" /> + <Key + latin:keyLabel="c" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_c" /> + <Key + latin:keyLabel="v" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_v" /> + <Key + latin:keyLabel="b" /> + <Key + latin:keyLabel="n" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_n" /> + <Key + latin:keyLabel="m" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="15%p" + latin:keyEdgeFlags="right" /> + </Row> +</merge> diff --git a/java/res/xml/kbd_qwerty_rows.xml b/java/res/xml/kbd_qwerty_rows.xml new file mode 100644 index 000000000..6237712f6 --- /dev/null +++ b/java/res/xml/kbd_qwerty_rows.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/kbd_key_styles" /> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row1" /> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row2" /> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row3" /> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row4" /> +</merge> diff --git a/java/res/xml/kbd_qwerty_rows_scandinavia.xml b/java/res/xml/kbd_qwerty_rows_scandinavia.xml new file mode 100644 index 000000000..4fa2e6eda --- /dev/null +++ b/java/res/xml/kbd_qwerty_rows_scandinavia.xml @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/kbd_key_styles" /> + <Row + latin:keyWidth="9.09%p" + latin:rowEdgeFlags="top" + > + <Key + latin:keyLabel="q" + latin:keyHintIcon="@drawable/keyboard_hint_1" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_q" + latin:keyWidth="8.75%p" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="w" + latin:keyHintIcon="@drawable/keyboard_hint_2" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_w" /> + <Key + latin:keyLabel="e" + latin:keyHintIcon="@drawable/keyboard_hint_3" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_e" /> + <Key + latin:keyLabel="r" + latin:keyHintIcon="@drawable/keyboard_hint_4" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_r" /> + <Key + latin:keyLabel="t" + latin:keyHintIcon="@drawable/keyboard_hint_5" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_t" /> + <Key + latin:keyLabel="y" + latin:keyHintIcon="@drawable/keyboard_hint_6" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_y" /> + <Key + latin:keyLabel="u" + latin:keyHintIcon="@drawable/keyboard_hint_7" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_u" /> + <Key + latin:keyLabel="i" + latin:keyHintIcon="@drawable/keyboard_hint_8" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_i" /> + <Key + latin:keyLabel="o" + latin:keyHintIcon="@drawable/keyboard_hint_9" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_o" /> + <Key + latin:keyLabel="p" + latin:keyHintIcon="@drawable/keyboard_hint_0" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_p" /> + <Key + latin:keyLabel="å" + latin:keyWidth="8.75%p" + latin:keyEdgeFlags="right" /> + </Row> + <Row + latin:keyWidth="9.09%p" + > + <Key + latin:keyLabel="a" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_a" + latin:keyWidth="8.75%p" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="s" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_s" /> + <Key + latin:keyLabel="d" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_d" /> + <Key + latin:keyLabel="f" /> + <Key + latin:keyLabel="g" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_g" /> + <Key + latin:keyLabel="h" /> + <Key + latin:keyLabel="j" /> + <Key + latin:keyLabel="k" /> + <Key + latin:keyLabel="l" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_l" /> + <Key + latin:keyLabel="@string/keylabel_for_scandinavia_row2_10" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_scandinavia_row2_10" /> + <Key + latin:keyLabel="@string/keylabel_for_scandinavia_row2_11" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_scandinavia_row2_11" + latin:keyWidth="8.75%p" + latin:keyEdgeFlags="right" /> + </Row> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row3" /> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row4" /> +</merge> diff --git a/java/res/xml/kbd_qwertz_rows.xml b/java/res/xml/kbd_qwertz_rows.xml new file mode 100644 index 000000000..4dbb6412a --- /dev/null +++ b/java/res/xml/kbd_qwertz_rows.xml @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <include + latin:keyboardLayout="@xml/kbd_key_styles" /> + <Row + latin:keyWidth="10%p" + latin:rowEdgeFlags="top" + > + <Key + latin:keyLabel="q" + latin:keyHintIcon="@drawable/keyboard_hint_1" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_q" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="w" + latin:keyHintIcon="@drawable/keyboard_hint_2" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_w" /> + <Key + latin:keyLabel="e" + latin:keyHintIcon="@drawable/keyboard_hint_3" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_e" /> + <Key + latin:keyLabel="r" + latin:keyHintIcon="@drawable/keyboard_hint_4" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_r" /> + <Key + latin:keyLabel="t" + latin:keyHintIcon="@drawable/keyboard_hint_5" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_t" /> + <Key + latin:keyLabel="z" + latin:keyHintIcon="@drawable/keyboard_hint_6" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_z" /> + <Key + latin:keyLabel="u" + latin:keyHintIcon="@drawable/keyboard_hint_7" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_u" /> + <Key + latin:keyLabel="i" + latin:keyHintIcon="@drawable/keyboard_hint_8" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_i" /> + <Key + latin:keyLabel="o" + latin:keyHintIcon="@drawable/keyboard_hint_9" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_o" /> + <Key + latin:keyLabel="p" + latin:keyHintIcon="@drawable/keyboard_hint_0" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_p" + latin:keyEdgeFlags="right" /> + </Row> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row2" /> + <Row + latin:keyWidth="10%p" + > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="15%p" + latin:keyEdgeFlags="left" /> + <Key + latin:keyLabel="y" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_y" /> + <Key + latin:keyLabel="x" /> + <Key + latin:keyLabel="c" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_c" /> + <Key + latin:keyLabel="v" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_v" /> + <Key + latin:keyLabel="b" /> + <Key + latin:keyLabel="n" + latin:popupKeyboard="@xml/kbd_popup_template" + latin:popupCharacters="@string/alternates_for_n" /> + <Key + latin:keyLabel="m" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="15%p" + latin:keyEdgeFlags="right" /> + </Row> + <include + latin:keyboardLayout="@xml/kbd_qwerty_row4" /> +</merge> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 65816aa4e..7cdd63446 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -20,7 +20,7 @@ <!-- The attributes in this XML file provide configuration information --> <!-- for the Input Method Manager. --> -<!-- Keyboard: en_US, cs, da, de, en_GB, es, es_rUS, fr, fr_rCA, it, nb, nl, sr, sv --> +<!-- Keyboard: en_US, cs, da, de, en_GB, es, es_US, fr, fr_CA, it, nb, nl, sr, sv --> <!-- Voice: cs, da, de, en_AU, en_GB, en_IN, en_NZ, en_US, es, fr, ko, ja, pl, pt, ru, tr, zh_CN, zh_TW --> <!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. --> <!-- TODO: use <lang>_mic icon instead of a common mic icon. --> @@ -59,9 +59,9 @@ android:imeSubtypeLocale="es" android:imeSubtypeMode="keyboard" /> - <subtype android:icon="@drawable/ic_subtype_keyboard_es_us" - android:label="@string/subtype_mode_es_rUS_keyboard" - android:imeSubtypeLocale="es_rUS" + <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_mode_es_US_keyboard" + android:imeSubtypeLocale="es_US" android:imeSubtypeMode="keyboard" /> <subtype android:icon="@drawable/ic_subtype_keyboard_fr" @@ -69,9 +69,9 @@ android:imeSubtypeLocale="fr" android:imeSubtypeMode="keyboard" /> - <subtype android:icon="@drawable/ic_subtype_keyboard_fr_ca" - android:label="@string/subtype_mode_fr_rCA_keyboard" - android:imeSubtypeLocale="fr_rCA" + <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_mode_fr_CA_keyboard" + android:imeSubtypeLocale="fr_CA" android:imeSubtypeMode="keyboard" /> <subtype android:icon="@drawable/ic_subtype_keyboard_it" |
