Merge "Rename keyboard rows consistently"

This commit is contained in:
Tadashi G. Takaoka 2011-06-17 02:15:00 -07:00 committed by Android (Google) Code Review
commit 1b7362b59b
43 changed files with 444 additions and 135 deletions

View file

@ -23,5 +23,5 @@
latin:keyboardLocale="ar" latin:keyboardLocale="ar"
> >
<include <include
latin:keyboardLayout="@xml/kbd_ar_rows" /> latin:keyboardLayout="@xml/kbd_rows_arabic" />
</Keyboard> </Keyboard>

View file

@ -23,5 +23,5 @@
latin:keyboardLocale="cs" latin:keyboardLocale="cs"
> >
<include <include
latin:keyboardLayout="@xml/kbd_qwertz_rows" /> latin:keyboardLayout="@xml/kbd_rows_qwertz" />
</Keyboard> </Keyboard>

View file

@ -23,5 +23,5 @@
latin:keyboardLocale="da" latin:keyboardLocale="da"
> >
<include <include
latin:keyboardLayout="@xml/kbd_qwerty_rows_scandinavia" /> latin:keyboardLayout="@xml/kbd_rows_scandinavian" />
</Keyboard> </Keyboard>

View file

@ -23,5 +23,5 @@
latin:keyboardLocale="de" latin:keyboardLocale="de"
> >
<include <include
latin:keyboardLayout="@xml/kbd_qwertz_rows" /> latin:keyboardLayout="@xml/kbd_rows_qwertz" />
</Keyboard> </Keyboard>

View file

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

View file

@ -23,5 +23,5 @@
latin:keyboardLocale="fi" latin:keyboardLocale="fi"
> >
<include <include
latin:keyboardLayout="@xml/kbd_qwerty_rows_scandinavia" /> latin:keyboardLayout="@xml/kbd_rows_scandinavian" />
</Keyboard> </Keyboard>

View file

@ -23,5 +23,5 @@
latin:keyboardLocale="fr_CA" latin:keyboardLocale="fr_CA"
> >
<include <include
latin:keyboardLayout="@xml/kbd_qwerty_rows" /> latin:keyboardLayout="@xml/kbd_rows_qwerty" />
</Keyboard> </Keyboard>

View file

@ -23,5 +23,5 @@
latin:keyboardLocale="fr_CH" latin:keyboardLocale="fr_CH"
> >
<include <include
latin:keyboardLayout="@xml/kbd_qwertz_rows" /> latin:keyboardLayout="@xml/kbd_rows_qwertz" />
</Keyboard> </Keyboard>

View file

@ -23,5 +23,5 @@
latin:keyboardLocale="fr" latin:keyboardLocale="fr"
> >
<include <include
latin:keyboardLayout="@xml/kbd_azerty_rows" /> latin:keyboardLayout="@xml/kbd_rows_azerty" />
</Keyboard> </Keyboard>

View file

@ -23,5 +23,5 @@
latin:keyboardLocale="hu" latin:keyboardLocale="hu"
> >
<include <include
latin:keyboardLayout="@xml/kbd_qwertz_rows" /> latin:keyboardLayout="@xml/kbd_rows_qwertz" />
</Keyboard> </Keyboard>

View file

@ -23,5 +23,5 @@
latin:keyboardLocale="iw" latin:keyboardLocale="iw"
> >
<include <include
latin:keyboardLayout="@xml/kbd_iw_rows" /> latin:keyboardLayout="@xml/kbd_rows_hebrew" />
</Keyboard> </Keyboard>

View file

@ -23,5 +23,5 @@
latin:keyboardLocale="nb" latin:keyboardLocale="nb"
> >
<include <include
latin:keyboardLayout="@xml/kbd_qwerty_rows_scandinavia" /> latin:keyboardLayout="@xml/kbd_rows_scandinavian" />
</Keyboard> </Keyboard>

View file

@ -23,5 +23,5 @@
latin:keyboardLocale="pl" latin:keyboardLocale="pl"
> >
<include <include
latin:keyboardLayout="@xml/kbd_qwerty_rows" /> latin:keyboardLayout="@xml/kbd_rows_qwerty" />
</Keyboard> </Keyboard>

View file

@ -23,5 +23,5 @@
latin:keyboardLocale="pt" latin:keyboardLocale="pt"
> >
<include <include
latin:keyboardLayout="@xml/kbd_qwerty_rows" /> latin:keyboardLayout="@xml/kbd_rows_qwerty" />
</Keyboard> </Keyboard>

View file

@ -23,5 +23,5 @@
latin:keyboardLocale="ru" latin:keyboardLocale="ru"
> >
<include <include
latin:keyboardLayout="@xml/kbd_ru_rows" /> latin:keyboardLayout="@xml/kbd_rows_russian" />
</Keyboard> </Keyboard>

View file

@ -23,5 +23,5 @@
latin:keyboardLocale="sr" latin:keyboardLocale="sr"
> >
<include <include
latin:keyboardLayout="@xml/kbd_sr_rows" /> latin:keyboardLayout="@xml/kbd_rows_serbian" />
</Keyboard> </Keyboard>

View file

@ -23,5 +23,5 @@
latin:keyboardLocale="sv" latin:keyboardLocale="sv"
> >
<include <include
latin:keyboardLayout="@xml/kbd_qwerty_rows_scandinavia" /> latin:keyboardLayout="@xml/kbd_rows_scandinavian" />
</Keyboard> </Keyboard>

View file

@ -1,114 +0,0 @@
<?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" />
<Row
latin:keyWidth="8.0%p"
latin:rowEdgeFlags="top"
>
<Key
latin:keyLabel="q"
latin:popupCharacters="@string/alternates_for_q"
latin:keyXPos="2.15%p"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="w"
latin:popupCharacters="@string/alternates_for_w" />
<Key
latin:keyLabel="e"
latin:popupCharacters="@string/alternates_for_e" />
<Key
latin:keyLabel="r"
latin:popupCharacters="@string/alternates_for_r" />
<Key
latin:keyLabel="t"
latin:popupCharacters="@string/alternates_for_t" />
<Key
latin:keyLabel="y"
latin:popupCharacters="@string/alternates_for_y" />
<Key
latin:keyLabel="u"
latin:popupCharacters="@string/alternates_for_u" />
<Key
latin:keyLabel="i"
latin:popupCharacters="@string/alternates_for_i" />
<Key
latin:keyLabel="o"
latin:popupCharacters="@string/alternates_for_o" />
<Key
latin:keyLabel="p"
latin:popupCharacters="@string/alternates_for_p" />
<Key
latin:keyLabel="å" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth"
latin:keyEdgeFlags="right" />
</Row>
<Row
latin:keyWidth="8.0%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="@string/keylabel_for_scandinavia_row2_10"
latin:popupCharacters="@string/alternates_for_scandinavia_row2_10" />
<Key
latin:keyLabel="@string/keylabel_for_scandinavia_row2_11"
latin:popupCharacters="@string/alternates_for_scandinavia_row2_11" />
<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,134 @@
<?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.
*/
-->
<!-- This file for Arabic layout is an alpha version. It allows to enter -->
<!-- some right-to-left text, but it has gone through no study whatsoever, -->
<!-- and needs to be run through UX. -->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
latin:keyboardLayout="@xml/kbd_key_styles" />
<Row
latin:keyWidth="8.0%p"
>
<Key
latin:keyLabel="ض"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="ص" />
<Key
latin:keyLabel="ث" />
<Key
latin:keyLabel="ق" />
<Key
latin:keyLabel="ف"
latin:popupCharacters="ف,ڤ" />
<Key
latin:keyLabel="غ" />
<Key
latin:keyLabel="ع" />
<Key
latin:keyLabel="ه"
latin:popupCharacters="ه,هـ" />
<Key
latin:keyLabel="خ" />
<Key
latin:keyLabel="ح" />
<Key
latin:keyLabel="ج"
latin:popupCharacters="ج,چ" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth"
latin:keyEdgeFlags="right" />
</Row>
<Row
latin:keyWidth="8.0%p"
>
<Key
latin:keyLabel="ش"
latin:keyXPos="3.0%p" />
<Key
latin:keyLabel="س" />
<Key
latin:keyLabel="ي" />
<Key
latin:keyLabel="ب"
latin:popupCharacters="ب,پ" />
<Key
latin:keyLabel="ل"
latin:popupCharacters="ل,لا" />
<Key
latin:keyLabel="ا"
latin:popupCharacters="ا,أ,إ,آ" />
<Key
latin:keyLabel="ت" />
<Key
latin:keyLabel="ن" />
<Key
latin:keyLabel="م" />
<Key
latin:keyLabel="ك"
latin:popupCharacters="ك,گ" />
<Key
latin:keyLabel="ط" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth"
latin:keyEdgeFlags="right" />
</Row>
<Row
latin:keyWidth="7.65%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="8.0%p"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="ئ" />
<Key
latin:keyLabel="ء" />
<Key
latin:keyLabel="ؤ" />
<Key
latin:keyLabel="ر" />
<Key
latin:keyLabel="ذ" />
<Key
latin:keyLabel="ى" />
<Key
latin:keyLabel="ة" />
<Key
latin:keyLabel="و" />
<Key
latin:keyLabel="ز"
latin:popupCharacters="ز,ژ" />
<Key
latin:keyLabel="ظ" />
<Key
latin:keyLabel="د" />
<include
latin:keyboardLayout="@xml/kbd_row3_right" />
</Row>
<include latin:keyboardLayout="@xml/kbd_qwerty_row4" />
</merge>

View file

@ -24,7 +24,7 @@
<include <include
latin:keyboardLayout="@xml/kbd_key_styles" /> latin:keyboardLayout="@xml/kbd_key_styles" />
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%p"
latin:rowEdgeFlags="top" latin:rowEdgeFlags="top"
> >
<Key <Key
@ -65,11 +65,12 @@
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%p"
> >
<Key <Key
latin:keyLabel="q" latin:keyLabel="q"
latin:popupCharacters="@string/alternates_for_q" latin:popupCharacters="@string/alternates_for_q"
latin:keyXPos="5.0%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="s" latin:keyLabel="s"
@ -101,7 +102,7 @@
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
latin:keyWidth="8.9%p" latin:keyWidth="8.5%p"
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"

View file

@ -0,0 +1,122 @@
<?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" />
<Row
latin:keyWidth="8.600%p"
latin:rowEdgeFlags="top"
>
<Key
latin:keyLabel="," />
<Key
latin:keyLabel="." />
<Key
latin:keyLabel="ק" />
<Key
latin:keyLabel="ר" />
<Key
latin:keyLabel="א" />
<Key
latin:keyLabel="ט" />
<Key
latin:keyLabel="ו" />
<Key
latin:keyLabel="ן" />
<Key
latin:keyLabel="ם" />
<Key
latin:keyLabel="פ" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-12.000%p"
latin:keyWidth="fillBoth"
latin:keyEdgeFlags="right" />
</Row>
<Row
latin:keyWidth="8.600%p"
>
<Key
latin:keyLabel="ש"
latin:keyXPos="4.000%p" />
<Key
latin:keyLabel="ד" />
<Key
latin:keyLabel="ג"
latin:popupCharacters="ג,ג׳" />
<Key
latin:keyLabel="כ" />
<Key
latin:keyLabel="ע" />
<Key
latin:keyLabel="י"
latin:popupCharacters="י,ײַ" />
<Key
latin:keyLabel="ח"
latin:popupCharacters="ח,ח׳" />
<Key
latin:keyLabel="ל" />
<Key
latin:keyLabel="ך" />
<Key
latin:keyLabel="ף" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-10.400%p"
latin:keyWidth="fillBoth"
latin:keyEdgeFlags="right" />
</Row>
<Row
latin:keyWidth="8.600%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.000%p"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="ז"
latin:popupCharacters="ז,ז׳" />
<Key
latin:keyLabel="ס" />
<Key
latin:keyLabel="ב" />
<Key
latin:keyLabel="ה" />
<Key
latin:keyLabel="נ" />
<Key
latin:keyLabel="מ" />
<Key
latin:keyLabel="צ"
latin:popupCharacters="צ,צ׳" />
<Key
latin:keyLabel="ת"
latin:popupCharacters="ת,ת׳" />
<Key
latin:keyLabel="ץ"
latin:popupCharacters="ץ,ץ׳" />
<include
latin:keyboardLayout="@xml/kbd_row3_right" />
</Row>
<include latin:keyboardLayout="@xml/kbd_qwerty_row4" />
</merge>

View file

@ -0,0 +1,166 @@
<?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" />
<Row
latin:keyWidth="7.9%p"
latin:rowEdgeFlags="top"
>
<Key
latin:keyLabel="q"
latin:popupCharacters="@string/alternates_for_q"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="w"
latin:popupCharacters="@string/alternates_for_w" />
<Key
latin:keyLabel="e"
latin:popupCharacters="@string/alternates_for_e" />
<Key
latin:keyLabel="r"
latin:popupCharacters="@string/alternates_for_r" />
<Key
latin:keyLabel="t"
latin:popupCharacters="@string/alternates_for_t" />
<Key
latin:keyLabel="y"
latin:popupCharacters="@string/alternates_for_y" />
<Key
latin:keyLabel="u"
latin:popupCharacters="@string/alternates_for_u" />
<Key
latin:keyLabel="i"
latin:popupCharacters="@string/alternates_for_i" />
<Key
latin:keyLabel="o"
latin:popupCharacters="@string/alternates_for_o" />
<Key
latin:keyLabel="p"
latin:popupCharacters="@string/alternates_for_p" />
<Key
latin:keyLabel="å" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth"
latin:keyEdgeFlags="right" />
</Row>
<Row
latin:keyWidth="7.9%p"
>
<Key
latin:keyLabel="a"
latin:keyXPos="3.5%p"
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="@string/keylabel_for_scandinavia_row2_10"
latin:popupCharacters="@string/alternates_for_scandinavia_row2_10" />
<Key
latin:keyLabel="@string/keylabel_for_scandinavia_row2_11"
latin:popupCharacters="@string/alternates_for_scandinavia_row2_11" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth"
latin:keyEdgeFlags="right" />
</Row>
<Row
latin:keyWidth="7.9%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p"
latin:keyEdgeFlags="left" />
<Spacer
latin:keyWidth="4.35%p" />
<Key
latin:keyLabel="z"
latin:popupCharacters="@string/alternates_for_z" />
<Key
latin:keyLabel="x" />
<Key
latin:keyLabel="c"
latin:popupCharacters="@string/alternates_for_c" />
<Key
latin:keyLabel="v"
latin:popupCharacters="@string/alternates_for_v" />
<Key
latin:keyLabel="b" />
<Key
latin:keyLabel="n"
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:keyLabelOption="hasUppercaseLetter"
latin:keyHintLetter="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLetter="\?"
latin:popupCharacters="\?" />
</default>
</switch>
<Spacer
latin:keyWidth="4.35%p" />
<include
latin:keyboardLayout="@xml/kbd_row3_right" />
</Row>
<include
latin:keyboardLayout="@xml/kbd_qwerty_row4" />
</merge>

View file

@ -23,5 +23,5 @@
latin:keyboardLocale="en_GB,en_US" latin:keyboardLocale="en_GB,en_US"
> >
<include <include
latin:keyboardLayout="@xml/kbd_qwerty_rows" /> latin:keyboardLayout="@xml/kbd_rows_qwerty" />
</Keyboard> </Keyboard>