Merge "Support Spanish keyboard"

main
Tadashi G. Takaoka 2011-06-17 09:17:55 -07:00 committed by Android (Google) Code Review
commit c029e0f4a7
6 changed files with 209 additions and 2 deletions

View File

@ -25,4 +25,6 @@
<string name="alternates_for_u">7,ú,ü,ù,û,ū</string> <string name="alternates_for_u">7,ú,ü,ù,û,ū</string>
<string name="alternates_for_n">ñ,ń</string> <string name="alternates_for_n">ñ,ń</string>
<string name="alternates_for_c">ç,ć,č</string> <string name="alternates_for_c">ç,ć,č</string>
<string name="alternates_for_punctuation">"\\,,\?,!,¿,¡,:,-,\',\",),(,/,;,+,&amp;,\@"</string>
<string name="alternates_for_web_tab_punctuation">".,\\,,\?,!,¿,¡,:,-,\',\",),(,/,;,+,&amp;,\@"</string>
</resources> </resources>

View File

@ -23,5 +23,5 @@
latin:keyboardLocale="es,es_US" latin:keyboardLocale="es,es_US"
> >
<include <include
latin:keyboardLayout="@xml/kbd_rows_qwerty" /> latin:keyboardLayout="@xml/kbd_rows_spanish" />
</Keyboard> </Keyboard>

View File

@ -150,7 +150,7 @@
</switch> </switch>
<include <include
latin:keyboardLayout="@xml/kbd_row3_right" /> latin:keyboardLayout="@xml/kbd_row3_right" />
</Row> </Row>
<include <include
latin:keyboardLayout="@xml/kbd_qwerty_row4" /> latin:keyboardLayout="@xml/kbd_qwerty_row4" />
</merge> </merge>

View File

@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2011, 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" />
<Row
latin:keyWidth="8.5%p"
>
<Key
latin:keyLabel="a"
latin:popupCharacters="@string/alternates_for_a"
latin:keyXPos="5.0%p"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="s"
latin:popupCharacters="@string/alternates_for_s" />
<Key
latin:keyLabel="d"
latin:popupCharacters="@string/alternates_for_d" />
<Key
latin:keyLabel="f" />
<Key
latin:keyLabel="g"
latin:popupCharacters="@string/alternates_for_g" />
<Key
latin:keyLabel="h" />
<Key
latin:keyLabel="j" />
<Key
latin:keyLabel="k"
latin:popupCharacters="@string/alternates_for_k" />
<Key
latin:keyLabel="l"
latin:popupCharacters="@string/alternates_for_l" />
<Key
latin:keyLabel="ñ" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth"
latin:keyEdgeFlags="right" />
</Row>
<include
latin:keyboardLayout="@xml/kbd_qwerty_row3" />
<include
latin:keyboardLayout="@xml/kbd_qwerty_row4" />
</merge>

View File

@ -0,0 +1,72 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2011, 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" />
<Row
latin:keyWidth="8.125%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelOption="alignLeft"
latin:keyWidth="10.167%p"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="a"
latin:popupCharacters="@string/alternates_for_a" />
<Key
latin:keyLabel="s"
latin:popupCharacters="@string/alternates_for_s" />
<Key
latin:keyLabel="d"
latin:popupCharacters="@string/alternates_for_d" />
<Key
latin:keyLabel="f" />
<Key
latin:keyLabel="g"
latin:popupCharacters="@string/alternates_for_g" />
<Key
latin:keyLabel="h" />
<Key
latin:keyLabel="j" />
<Key
latin:keyLabel="k"
latin:popupCharacters="@string/alternates_for_k" />
<Key
latin:keyLabel="l"
latin:popupCharacters="@string/alternates_for_l" />
<Key
latin:keyLabel="ñ" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-15.704%p"
latin:keyWidth="fillBoth"
latin:keyEdgeFlags="right" />
</Row>
<include
latin:keyboardLayout="@xml/kbd_qwerty_row3" />
<include
latin:keyboardLayout="@xml/kbd_qwerty_row4" />
</merge>

View File

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2011, 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" />
<Row
latin:keyWidth="10%p"
>
<Key
latin:keyLabel="a"
latin:popupCharacters="@string/alternates_for_a"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="s"
latin:popupCharacters="@string/alternates_for_s" />
<Key
latin:keyLabel="d"
latin:popupCharacters="@string/alternates_for_d" />
<Key
latin:keyLabel="f" />
<Key
latin:keyLabel="g"
latin:popupCharacters="@string/alternates_for_g" />
<Key
latin:keyLabel="h" />
<Key
latin:keyLabel="j" />
<Key
latin:keyLabel="k"
latin:popupCharacters="@string/alternates_for_k" />
<Key
latin:keyLabel="l"
latin:popupCharacters="@string/alternates_for_l" />
<Key
latin:keyLabel="ñ"
latin:keyEdgeFlags="right" />
</Row>
<include
latin:keyboardLayout="@xml/kbd_qwerty_row3" />
<include
latin:keyboardLayout="@xml/kbd_qwerty_row4" />
</merge>