Merge "Support Spanish keyboard" (c029e0f4) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/values-es/donottranslate-altchars.xml

+2 −0

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

java/res/xml-es/kbd_qwerty.xml

+1 −1

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

java/res/xml-sw600dp/kbd_rows_spanish.xml

0 → 100644

+69 −0

Original line number	Diff line number	Diff line
		<?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>

java/res/xml-sw768dp/kbd_rows_spanish.xml

0 → 100644

+72 −0

Original line number	Diff line number	Diff line
		<?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>

java/res/xml/kbd_rows_spanish.xml

0 → 100644

+64 −0

Original line number	Diff line number	Diff line
		<?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>

java/res/xml-sw600dp/kbd_rows_azerty.xml

+1 −1

File changed.

Contains only whitespace changes.