Initial split QWERTY layout

Change [2/3]

Add an attribute that's used in layout xmls for specifying
the split-keyboard layout.
This attribute will be checked/set by the KeyboardBuilder which knows about
the "splittability" of the keyboard.

Bug: 4968173
Change-Id: I5d792e570b9648e09022e9b7e92a972a161009ee
This commit is contained in:
Sandeep Siddhartha 2014-09-09 16:21:35 +09:00
parent 3939455c1d
commit 9c31e8f863
16 changed files with 756 additions and 143 deletions

View File

@ -483,6 +483,8 @@
<attr name="localeCode" format="string" />
<attr name="languageCode" format="string" />
<attr name="countryCode" format="string" />
<!-- Enable split keyboard layout. Disabled by default. -->
<attr name="isSplitLayout" format="boolean" />
</declare-styleable>
<declare-styleable name="Keyboard_KeyStyle">

View File

@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2014, 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"
>
<!-- TODO: Consolidate the layout specification between protrait and landscape.
Ideally just the keyWidth should be different -->
<switch>
<!-- fa: Perisan
kn: Kannada
ne: Nepali
te: Telugu -->
<case
latin:languageCode="fa|kn|ne|te"
latin:languageSwitchKeyEnabled="true"
>
<Key
latin:keyStyle="languageSwitchKeyStyle" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="7.0%p" />
<Key
latin:keyStyle="zwnjKeyStyle" />
</case>
<case
latin:languageCode="fa|kn|ne|te"
latin:languageSwitchKeyEnabled="false"
>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="14.0%p" />
<Key
latin:keyStyle="zwnjKeyStyle" />
</case>
<case
latin:languageSwitchKeyEnabled="true"
>
<Key
latin:keyStyle="languageSwitchKeyStyle" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="14.0%p" />
</case>
<!-- languageSwitchKeyEnabled="false" -->
<default>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="21.0%p" />
</default>
</switch>
</merge>

View File

@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2014, 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"
>
<switch>
<!-- Split the 4th row for split layouts -->
<case
latin:isSplitLayout="true"
>
<Row
latin:keyWidth="7.0%p"
latin:backgroundType="functional"
>
<Key
latin:keyStyle="toSymbolKeyStyle" />
<include
latin:keyboardLayout="@xml/key_comma" />
<!-- Space key. -->
<include
latin:keyboardLayout="@xml/key_space_3kw"
latin:backgroundType="normal" />
<Spacer
latin:keyWidth="28.0%p" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="21.0%p" />
<include
latin:keyboardLayout="@xml/key_period" />
<include
latin:keyboardLayout="@xml/key_emoji" />
</Row>
</case>
<default>
<Row
latin:keyWidth="9.0%p"
latin:backgroundType="functional"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/key_comma" />
<!-- Space key. -->
<include
latin:keyXPos="19.0%p"
latin:keyboardLayout="@xml/key_space_7kw"
latin:backgroundType="normal" />
<include
latin:keyboardLayout="@xml/key_period" />
<include
latin:keyboardLayout="@xml/key_emoji" />
</Row>
</default>
</switch>
</merge>

View File

@ -0,0 +1,133 @@
<?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/key_styles_common" />
<!-- First row -->
<Row>
<switch>
<!-- Split keyboard layout for the first row -->
<case
latin:isSplitLayout="true"
>
<include
latin:keyboardLayout="@xml/rowkeys_qwerty1_left5"
latin:keyWidth="7.0%p" />
<Spacer
latin:keyWidth="20.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwerty1_right5"
latin:keyWidth="7.0%p" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="10.0%p" />
</case>
<!-- Regular layout for the first row -->
<default>
<include
latin:keyboardLayout="@xml/rowkeys_qwerty1"
latin:keyWidth="9.0%p" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</default>
</switch>
</Row>
<!-- Second row -->
<Row>
<switch>
<!-- Split keyboard layout for the second row -->
<case
latin:isSplitLayout="true"
>
<include
latin:keyboardLayout="@xml/rowkeys_qwerty2_left5"
latin:keyXPos="4.0%p"
latin:keyWidth="7.0%p" />
<Spacer
latin:keyWidth="23.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwerty2_right4"
latin:keyWidth="7.0%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="10.0%p" />
</case>
<!-- Regular layout for the second row -->
<default>
<include
latin:keyboardLayout="@xml/rowkeys_qwerty2"
latin:keyXPos="4.5%p"
latin:keyWidth="9.0%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</default>
</switch>
</Row>
<!-- Third row -->
<Row>
<switch>
<!-- Split keyboard layout for the third row -->
<case
latin:isSplitLayout="true"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwerty3_left4"
latin:keyWidth="7.0%p" />
<Spacer
latin:keyWidth="17.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwerty3_right3"
latin:keyWidth="7.0%p" />
<include
latin:keyboardLayout="@xml/keys_exclamation_question"
latin:keyWidth="7.0%p" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
</case>
<!-- Regular layout for the third row -->
<default>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwerty3"
latin:keyWidth="9.0%p" />
<include
latin:keyboardLayout="@xml/keys_exclamation_question"
latin:keyWidth="9.0%p" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="fillRight" />
</default>
</switch>
</Row>
<!-- Fourth row -->
<include
latin:keyboardLayout="@xml/row_qwerty4" />
</merge>

View File

@ -0,0 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2014, 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"
>
<switch>
<!-- fa: Perisan
kn: Kannada
ne: Nepali
te: Telugu -->
<case
latin:languageCode="fa|kn|ne|te"
latin:languageSwitchKeyEnabled="true"
>
<Key
latin:keyStyle="languageSwitchKeyStyle" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="8.0%p" />
<Key
latin:keyStyle="zwnjKeyStyle" />
</case>
<case
latin:languageCode="fa|kn|ne|te"
latin:languageSwitchKeyEnabled="false"
>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="16.0%p" />
<Key
latin:keyStyle="zwnjKeyStyle" />
</case>
<case
latin:languageSwitchKeyEnabled="true"
>
<Key
latin:keyStyle="languageSwitchKeyStyle" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="16.0%p" />
</case>
<!-- languageSwitchKeyEnabled="false" -->
<default>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="24.0%p" />
</default>
</switch>
</merge>

View File

@ -21,23 +21,54 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Row
latin:keyWidth="9.0%p"
latin:backgroundType="functional"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/key_comma" />
<!-- Space key. -->
<include
latin:keyXPos="19.0%p"
latin:keyboardLayout="@xml/key_space_7kw"
latin:backgroundType="normal" />
<include
latin:keyboardLayout="@xml/key_period" />
<include
latin:keyboardLayout="@xml/key_emoji" />
</Row>
<switch>
<!-- Split the 4th row for split layouts -->
<case
latin:isSplitLayout="true"
>
<Row
latin:keyWidth="8.0%p"
latin:backgroundType="functional"
>
<Key
latin:keyStyle="toSymbolKeyStyle" />
<include
latin:keyboardLayout="@xml/key_comma" />
<!-- Space key. -->
<include
latin:keyboardLayout="@xml/key_space_3kw"
latin:backgroundType="normal" />
<Spacer
latin:keyWidth="20.0%p" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="24.0%p" />
<include
latin:keyboardLayout="@xml/key_period" />
<include
latin:keyboardLayout="@xml/key_emoji" />
</Row>
</case>
<default>
<Row
latin:keyWidth="9.0%p"
latin:backgroundType="functional"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/key_comma" />
<!-- Space key. -->
<include
latin:keyXPos="19.0%p"
latin:keyboardLayout="@xml/key_space_7kw"
latin:backgroundType="normal" />
<include
latin:keyboardLayout="@xml/key_period" />
<include
latin:keyboardLayout="@xml/key_emoji" />
</Row>
</default>
</switch>
</merge>

View File

@ -23,39 +23,114 @@
>
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="9.0%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_qwerty1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
<!-- TODO: Consolidate the layout specification between protrait and landscape.
Ideally just the keyWidth should be different and the spacer should adjust to fill
the available space. -->
<!-- First row -->
<Row>
<switch>
<!-- Split keyboard layout for the first row -->
<case
latin:isSplitLayout="true"
>
<include
latin:keyboardLayout="@xml/rowkeys_qwerty1_left5"
latin:keyWidth="8.0%p" />
<Spacer
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwerty1_right5"
latin:keyWidth="8.0%p" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="10.0%p" />
</case>
<!-- Regular layout for the first row -->
<default>
<include
latin:keyboardLayout="@xml/rowkeys_qwerty1"
latin:keyWidth="9.0%p" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</default>
</switch>
</Row>
<Row
latin:keyWidth="9.0%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_qwerty2"
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
<!-- Second row -->
<Row>
<switch>
<!-- Split keyboard layout for the second row -->
<case
latin:isSplitLayout="true"
>
<include
latin:keyboardLayout="@xml/rowkeys_qwerty2_left5"
latin:keyXPos="4.0%p"
latin:keyWidth="8.0%p" />
<Spacer
latin:keyWidth="14.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwerty2_right4"
latin:keyWidth="8.0%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="10.0%p" />
</case>
<!-- Regular layout for the second row -->
<default>
<include
latin:keyboardLayout="@xml/rowkeys_qwerty2"
latin:keyXPos="4.5%p"
latin:keyWidth="9.0%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</default>
</switch>
</Row>
<Row
latin:keyWidth="9.0%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwerty3" />
<include
latin:keyboardLayout="@xml/keys_exclamation_question" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="fillRight" />
<!-- Third row -->
<Row>
<switch>
<!-- Split keyboard layout for the third row -->
<case
latin:isSplitLayout="true"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwerty3_left4"
latin:keyWidth="8.0%p" />
<Spacer
latin:keyWidth="8.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwerty3_right3"
latin:keyWidth="8.0%p" />
<include
latin:keyboardLayout="@xml/keys_exclamation_question"
latin:keyWidth="8.0%p" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
</case>
<!-- Regular layout for the third row -->
<default>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwerty3"
latin:keyWidth="9.0%p" />
<include
latin:keyboardLayout="@xml/keys_exclamation_question"
latin:keyWidth="9.0%p" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="fillRight" />
</default>
</switch>
</Row>
<!-- Fourth row -->
<include
latin:keyboardLayout="@xml/row_qwerty4" />
</merge>

View File

@ -21,53 +21,10 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
latin:keySpec="!text/keyspec_q"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
latin:moreKeys="!text/morekeys_q" />
<Key
latin:keySpec="!text/keyspec_w"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
latin:moreKeys="!text/morekeys_w" />
<Key
latin:keySpec="e"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
latin:moreKeys="!text/morekeys_e" />
<Key
latin:keySpec="r"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4"
latin:moreKeys="!text/morekeys_r" />
<Key
latin:keySpec="t"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
latin:moreKeys="!text/morekeys_t" />
<Key
latin:keySpec="!text/keyspec_y"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
latin:moreKeys="!text/morekeys_y" />
<Key
latin:keySpec="u"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
latin:moreKeys="!text/morekeys_u" />
<Key
latin:keySpec="i"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
latin:moreKeys="!text/morekeys_i" />
<Key
latin:keySpec="o"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
latin:moreKeys="!text/morekeys_o" />
<Key
latin:keySpec="p"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0" />
<!-- q,w,e,r,t -->
<include
latin:keyboardLayout="@xml/rowkeys_qwerty1_left5" />
<!-- y,u,i,o,p -->
<include
latin:keyboardLayout="@xml/rowkeys_qwerty1_right5" />
</merge>

View File

@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2014, 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"
>
<Key
latin:keySpec="!text/keyspec_q"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
latin:moreKeys="!text/morekeys_q" />
<Key
latin:keySpec="!text/keyspec_w"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
latin:moreKeys="!text/morekeys_w" />
<Key
latin:keySpec="e"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
latin:moreKeys="!text/morekeys_e" />
<Key
latin:keySpec="r"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4"
latin:moreKeys="!text/morekeys_r" />
<Key
latin:keySpec="t"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
latin:moreKeys="!text/morekeys_t" />
</merge>

View File

@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2014, 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"
>
<Key
latin:keySpec="!text/keyspec_y"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
latin:moreKeys="!text/morekeys_y" />
<Key
latin:keySpec="u"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
latin:moreKeys="!text/morekeys_u" />
<Key
latin:keySpec="i"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
latin:moreKeys="!text/morekeys_i" />
<Key
latin:keySpec="o"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
latin:moreKeys="!text/morekeys_o" />
<Key
latin:keySpec="p"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0" />
</merge>

View File

@ -21,30 +21,10 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
latin:keySpec="a"
latin:moreKeys="!text/morekeys_a" />
<Key
latin:keySpec="s"
latin:moreKeys="!text/morekeys_s" />
<Key
latin:keySpec="d"
latin:moreKeys="!text/morekeys_d" />
<Key
latin:keySpec="f" />
<Key
latin:keySpec="g"
latin:moreKeys="!text/morekeys_g" />
<Key
latin:keySpec="h"
latin:moreKeys="!text/morekeys_h" />
<Key
latin:keySpec="j"
latin:moreKeys="!text/morekeys_j" />
<Key
latin:keySpec="k"
latin:moreKeys="!text/morekeys_k" />
<Key
latin:keySpec="l"
latin:moreKeys="!text/morekeys_l" />
<!-- a,s,d,f,g -->
<include
latin:keyboardLayout="@xml/rowkeys_qwerty2_left5" />
<!-- h,j,k,l -->
<include
latin:keyboardLayout="@xml/rowkeys_qwerty2_right4" />
</merge>

View File

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2014, 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"
>
<Key
latin:keySpec="a"
latin:moreKeys="!text/morekeys_a" />
<Key
latin:keySpec="s"
latin:moreKeys="!text/morekeys_s" />
<Key
latin:keySpec="d"
latin:moreKeys="!text/morekeys_d" />
<Key
latin:keySpec="f" />
<Key
latin:keySpec="g"
latin:moreKeys="!text/morekeys_g" />
</merge>

View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2014, 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"
>
<Key
latin:keySpec="h"
latin:moreKeys="!text/morekeys_h" />
<Key
latin:keySpec="j"
latin:moreKeys="!text/morekeys_j" />
<Key
latin:keySpec="k"
latin:moreKeys="!text/morekeys_k" />
<Key
latin:keySpec="l"
latin:moreKeys="!text/morekeys_l" />
</merge>

View File

@ -21,23 +21,10 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
latin:keySpec="z"
latin:moreKeys="!text/morekeys_z" />
<Key
latin:keySpec="!text/keyspec_x"
latin:moreKeys="!text/morekeys_x" />
<Key
latin:keySpec="c"
latin:moreKeys="!text/morekeys_c" />
<Key
latin:keySpec="v"
latin:moreKeys="!text/morekeys_v" />
<Key
latin:keySpec="b" />
<Key
latin:keySpec="n"
latin:moreKeys="!text/morekeys_n" />
<Key
latin:keySpec="m" />
<!-- z,x,c,v -->
<include
latin:keyboardLayout="@xml/rowkeys_qwerty3_left4" />
<!-- b,n,m -->
<include
latin:keyboardLayout="@xml/rowkeys_qwerty3_right3" />
</merge>

View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2014, 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"
>
<Key
latin:keySpec="z"
latin:moreKeys="!text/morekeys_z" />
<Key
latin:keySpec="!text/keyspec_x"
latin:moreKeys="!text/morekeys_x" />
<Key
latin:keySpec="c"
latin:moreKeys="!text/morekeys_c" />
<Key
latin:keySpec="v"
latin:moreKeys="!text/morekeys_v" />
</merge>

View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2014, 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"
>
<Key
latin:keySpec="b" />
<Key
latin:keySpec="n"
latin:moreKeys="!text/morekeys_n" />
<Key
latin:keySpec="m" />
</merge>