nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modularize keyboard XML files 

* Remove duplicated xml-sw768dp/keys_apostrophe_dash.xml
* Separate keys_apostrophe_dash.xml to key_apostorhe.xml and
  key_dash.ml
* Separate key_space.xml from row_qwerty4.xml
* Separate key_f1.xml from xml{,-sw600dp}/row_qwerty4.xml
* Separate keys_f1f2.xml from xml-sw768dp/row_qwerty4.xml
* Fix incorrectly named rows_symbols{,_shift}4.xml to
  row_symbols{,_shift}4.xml

Change-Id: Id71967a016a348174d1fc265b654dbc233c6562e
main
Tadashi G. Takaoka 2012-04-20 11:19:07 +09:00
parent 6bfd5f6319
commit 9fa0a2e83f
44 changed files with 318 additions and 401 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
java/res/xml-sw600dp/kbd_azerty_symbols.xml → java/res/xml-sw600dp/kbd_10_10_7_symbols.xml
View File

0
java/res/xml-sw600dp/kbd_azerty_symbols_shift.xml → java/res/xml-sw600dp/kbd_10_10_7_symbols_shift.xml
View File

26
java/res/xml-sw600dp/kbd_spanish_symbols.xml
View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, 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"
>
<include
latin:keyboardLayout="@xml/rows_10_10_7_symbols" />
</Keyboard>

26
java/res/xml-sw600dp/kbd_spanish_symbols_shift.xml
View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, 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"
>
<include
latin:keyboardLayout="@xml/rows_10_10_7_symbols_shift" />
</Keyboard>

17
java/res/xml-sw600dp/keys_apostrophe_dash.xml → java/res/xml-sw600dp/key_apostrophe.xml
View File

@ -2,7 +2,7 @@
<!--
/*
**
** Copyright 2011, The Android Open Source Project
** Copyright 2012, 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.
@ -45,19 +45,4 @@
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="_" />
</case>
<default>
<Key
latin:keyLabel="!text/keylabel_for_dash"
latin:keyHintLabel="!text/keyhintlabel_for_dash"
latin:moreKeys="!text/more_keys_for_dash"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
</merge>

21
java/res/xml-sw600dp/kbd_hebrew_symbols.xml → java/res/xml-sw600dp/key_dash.xml
View File

@ -18,9 +18,22 @@
*/
-->
<Keyboard
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
latin:keyboardLayout="@xml/rows_10_10_7_symbols" />
</Keyboard>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="_" />
</case>
<default>
<Key
latin:keyLabel="!text/keylabel_for_dash"
latin:keyHintLabel="!text/keyhintlabel_for_dash"
latin:moreKeys="!text/more_keys_for_dash"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
</merge>

45
java/res/xml-sw600dp/key_f1.xml Normal file
View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, 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>
<case
latin:mode="email"
>
<Key
latin:keyStyle="comKeyStyle" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyStyle="comKeyStyle" />
</case>
<default>
<Key
latin:keyLabel="/"
latin:keyHintLabel="\@"
latin:moreKeys="\@"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
</merge>

24
java/res/xml-sw600dp/kbd_hebrew_symbols_shift.xml → java/res/xml-sw600dp/key_space.xml
View File

@ -18,9 +18,25 @@
*/
-->
<Keyboard
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
latin:keyboardLayout="@xml/rows_10_10_7_symbols_shift" />
</Keyboard>
<switch>
<case
latin:languageCode="fa"
>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="30.750%p"
latin:keyWidth="30.850%p" />
<Key
latin:keyStyle="zwnjKeyStyle" />
</case>
<default>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="30.750%p"
latin:keyWidth="39.750%p" />
</default>
</switch>
</merge>

47
java/res/xml-sw600dp/row_qwerty4.xml
View File

@ -29,45 +29,10 @@
latin:keyWidth="13.0%p" />
<Key
latin:keyStyle="tabKeyStyle" />
<switch>
<case
latin:mode="email"
>
<Key
latin:keyStyle="comKeyStyle" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyStyle="comKeyStyle" />
</case>
<default>
<Key
latin:keyLabel="/"
latin:keyHintLabel="\@"
latin:moreKeys="\@"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
<switch>
<case
latin:languageCode="fa"
>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="30.750%p"
latin:keyWidth="30.850%p" />
<Key
latin:keyStyle="zwnjKeyStyle" />
</case>
<default>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="30.750%p"
latin:keyWidth="39.750%p" />
</default>
</switch>
<include
latin:keyboardLayout="@xml/key_f1" />
<include
latin:keyboardLayout="@xml/key_space" />
<switch>
<case
latin:languageCode="iw"
@ -78,7 +43,9 @@
<!-- not languageCode="iw" -->
<default>
<include
latin:keyboardLayout="@xml/keys_apostrophe_dash" />
latin:keyboardLayout="@xml/key_apostrophe" />
<include
latin:keyboardLayout="@xml/key_dash" />
</default>
</switch>
<Spacer

0
java/res/xml-sw600dp/rows_symbols4.xml → java/res/xml-sw600dp/row_symbols4.xml
View File

0
java/res/xml-sw600dp/rows_symbols_shift4.xml → java/res/xml-sw600dp/row_symbols_shift4.xml
View File

2
java/res/xml-sw600dp/rows_10_10_7_symbols.xml
View File

@ -58,5 +58,5 @@
latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/rows_symbols4" />
latin:keyboardLayout="@xml/row_symbols4" />
</merge>

2
java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml
View File

@ -54,5 +54,5 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
</Row>
<include
latin:keyboardLayout="@xml/rows_symbols_shift4" />
latin:keyboardLayout="@xml/row_symbols_shift4" />
</merge>

4
java/res/xml-sw600dp/rows_hebrew.xml
View File

@ -27,7 +27,9 @@
latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/keys_apostrophe_dash" />
latin:keyboardLayout="@xml/key_apostrophe" />
<include
latin:keyboardLayout="@xml/key_dash" />
<include
latin:keyboardLayout="@xml/rowkeys_hebrew1" />
<Key

2
java/res/xml-sw600dp/rows_symbols.xml
View File

@ -58,5 +58,5 @@
latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/rows_symbols4" />
latin:keyboardLayout="@xml/row_symbols4" />
</merge>

2
java/res/xml-sw600dp/rows_symbols_shift.xml
View File

@ -54,5 +54,5 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
</Row>
<include
latin:keyboardLayout="@xml/rows_symbols_shift4" />
latin:keyboardLayout="@xml/row_symbols_shift4" />
</merge>

44
java/res/xml-sw768dp/key_space.xml Normal file
View File

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, 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>
<case
latin:languageCode="fa"
>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="31.250%p"
latin:keyWidth="29.453%p" />
<!-- U+200C: "" ZERO WIDTH NON-JOINER
U+200D: "" ZERO WIDTH JOINER -->
<Key
latin:keyStyle="zwnjKeyStyle" />
</case>
<default>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="31.250%p"
latin:keyWidth="37.500%p" />
</default>
</switch>
</merge>

71
java/res/xml-sw768dp/keys_f1f2.xml Normal file
View File

@ -0,0 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, 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>
<case
latin:mode="url"
>
<Key
latin:keyStyle="comKeyStyle"
latin:keyWidth="16.084%p" />
</case>
<default>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyStyle="comKeyStyle" />
</case>
<case
latin:imeAction="actionSearch"
>
<Key
latin:keyLabel=":"
latin:keyHintLabel="+"
latin:moreKeys="+"
latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<default>
<Key
latin:keyStyle="smileyKeyStyle" />
</default>
</switch>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="\@" />
</case>
<default>
<Key
latin:keyLabel="/"
latin:keyHintLabel="\@"
latin:moreKeys="\@"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
</default>
</switch>
</merge>

75
java/res/xml-sw768dp/row_qwerty4.xml
View File

@ -29,73 +29,10 @@
<Spacer
latin:keyXPos="15.157%p"
latin:keyWidth="0%p" />
<switch>
<case
latin:mode="url"
>
<Key
latin:keyStyle="comKeyStyle"
latin:keyWidth="16.084%p" />
</case>
<default>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyStyle="comKeyStyle" />
</case>
<case
latin:imeAction="actionSearch"
>
<Key
latin:keyLabel=":"
latin:keyHintLabel="+"
latin:moreKeys="+"
latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<default>
<Key
latin:keyStyle="smileyKeyStyle" />
</default>
</switch>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="\@" />
</case>
<default>
<Key
latin:keyLabel="/"
latin:keyHintLabel="\@"
latin:moreKeys="\@"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
</default>
</switch>
<switch>
<case
latin:languageCode="fa"
>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="31.250%p"
latin:keyWidth="29.453%p" />
<!-- U+200C: "" ZERO WIDTH NON-JOINER
U+200D: "" ZERO WIDTH JOINER -->
<Key
latin:keyStyle="zwnjKeyStyle" />
</case>
<default>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="31.250%p"
latin:keyWidth="37.500%p" />
</default>
</switch>
<include
latin:keyboardLayout="@xml/keys_f1f2" />
<include
latin:keyboardLayout="@xml/key_space" />
<switch>
<case
latin:languageCode="iw"
@ -105,7 +42,9 @@
</case>
<default>
<include
latin:keyboardLayout="@xml/keys_apostrophe_dash" />
latin:keyboardLayout="@xml/key_apostrophe" />
<include
latin:keyboardLayout="@xml/key_dash" />
</default>
</switch>
<switch>

0
java/res/xml-sw768dp/rows_symbols4.xml → java/res/xml-sw768dp/row_symbols4.xml
View File

0
java/res/xml-sw768dp/rows_symbols_shift4.xml → java/res/xml-sw768dp/row_symbols_shift4.xml
View File

2
java/res/xml-sw768dp/rows_10_10_7_symbols.xml
View File

@ -65,5 +65,5 @@
latin:keyWidth="fillBoth" />
</Row>
<include
latin:keyboardLayout="@xml/rows_symbols4" />
latin:keyboardLayout="@xml/row_symbols4" />
</merge>

2
java/res/xml-sw768dp/rows_10_10_7_symbols_shift.xml
View File

@ -65,5 +65,5 @@
latin:keyWidth="fillBoth" />
</Row>
<include
latin:keyboardLayout="@xml/rows_symbols_shift4" />
latin:keyboardLayout="@xml/row_symbols_shift4" />
</merge>

4
java/res/xml-sw768dp/rows_hebrew.xml
View File

@ -31,7 +31,9 @@
latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/keys_apostrophe_dash" />
latin:keyboardLayout="@xml/key_apostrophe" />
<include
latin:keyboardLayout="@xml/key_dash" />
<include
latin:keyboardLayout="@xml/rowkeys_hebrew1" />
<Key

2
java/res/xml-sw768dp/rows_symbols.xml
View File

@ -65,5 +65,5 @@
latin:keyWidth="fillBoth" />
</Row>
<include
latin:keyboardLayout="@xml/rows_symbols4" />
latin:keyboardLayout="@xml/row_symbols4" />
</merge>

2
java/res/xml-sw768dp/rows_symbols_shift.xml
View File

@ -65,5 +65,5 @@
latin:keyWidth="fillBoth" />
</Row>
<include
latin:keyboardLayout="@xml/rows_symbols_shift4" />
latin:keyboardLayout="@xml/row_symbols_shift4" />
</merge>

2
java/res/xml-sw768dp/rows_thai_symbols.xml
View File

@ -72,5 +72,5 @@
latin:keyWidth="fillBoth" />
</Row>
<include
latin:keyboardLayout="@xml/rows_symbols4" />
latin:keyboardLayout="@xml/row_symbols4" />
</merge>

2
java/res/xml-sw768dp/rows_thai_symbols_shift.xml
View File

@ -72,5 +72,5 @@
latin:keyWidth="fillBoth" />
</Row>
<include
latin:keyboardLayout="@xml/rows_symbols_shift4" />
latin:keyboardLayout="@xml/row_symbols_shift4" />
</merge>

0
java/res/xml/kbd_azerty_symbols.xml → java/res/xml/kbd_10_10_7_symbols.xml
View File

0
java/res/xml/kbd_azerty_symbols_shift.xml → java/res/xml/kbd_10_10_7_symbols_shift.xml
View File

26
java/res/xml/kbd_hebrew_symbols.xml
View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, 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"
>
<include
latin:keyboardLayout="@xml/rows_symbols" />
</Keyboard>

26
java/res/xml/kbd_hebrew_symbols_shift.xml
View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, 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"
>
<include
latin:keyboardLayout="@xml/rows_symbols_shift" />
</Keyboard>

26
java/res/xml/kbd_spanish_symbols.xml
View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, 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"
>
<include
latin:keyboardLayout="@xml/rows_symbols" />
</Keyboard>

26
java/res/xml/kbd_spanish_symbols_shift.xml
View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, 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"
>
<include
latin:keyboardLayout="@xml/rows_symbols_shift" />
</Keyboard>

39
java/res/xml-sw768dp/keys_apostrophe_dash.xml → java/res/xml/key_f1.xml
View File

@ -2,7 +2,7 @@
<!--
/*
**
** Copyright 2011, The Android Open Source Project
** Copyright 2012, 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.
@ -22,42 +22,33 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="-" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="/"
latin:keyHintLabel=":"
latin:moreKeys=":"
latin:keyStyle="hasShiftedLetterHintStyle" />
latin:keyStyle="f1MoreKeysStyle" />
</case>
<default>
<Key
latin:keyLabel="!text/keylabel_for_apostrophe"
latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
latin:moreKeys="!text/more_keys_for_apostrophe"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="_" />
latin:keyLabel="\@"
latin:keyStyle="f1MoreKeysStyle" />
</case>
<case
latin:hasShortcutKey="true"
>
<Key
latin:keyStyle="shortcutKeyStyle" />
</case>
<!-- latin:hasShortcutKey="false" -->
<default>
<Key
latin:keyLabel="!text/keylabel_for_dash"
latin:keyHintLabel="!text/keyhintlabel_for_dash"
latin:moreKeys="!text/more_keys_for_dash"
latin:keyStyle="hasShiftedLetterHintStyle" />
latin:keyLabel="!text/keylabel_for_comma"
latin:keyLabelFlags="hasPopupHint"
latin:additionalMoreKeys="!text/more_keys_for_comma"
latin:keyStyle="f1MoreKeysStyle" />
</default>
</switch>
</merge>

63
java/res/xml/key_space.xml Normal file
View File

@ -0,0 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, 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>
<case
latin:languageCode="fa"
latin:languageSwitchKeyEnabled="true"
>
<Key
latin:keyStyle="languageSwitchKeyStyle" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="30%p" />
<Key
latin:keyStyle="zwnjKeyStyle" />
</case>
<case
latin:languageCode="fa"
latin:languageSwitchKeyEnabled="false"
>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="40%p" />
<Key
latin:keyStyle="zwnjKeyStyle" />
</case>
<case
latin:languageSwitchKeyEnabled="true"
>
<Key
latin:keyStyle="languageSwitchKeyStyle" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="40%p" />
</case>
<!-- languageSwitchKeyEnabled="false" -->
<default>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="50%p" />
</default>
</switch>
</merge>

4
java/res/xml/keyboard_layout_set_azerty.xml
View File

@ -26,10 +26,10 @@
latin:enableProximityCharsCorrection="true" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_azerty_symbols" />
latin:elementKeyboard="@xml/kbd_10_10_7_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_azerty_symbols_shift" />
latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

4
java/res/xml/keyboard_layout_set_hebrew.xml
View File

@ -26,10 +26,10 @@
latin:enableProximityCharsCorrection="true" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_hebrew_symbols" />
latin:elementKeyboard="@xml/kbd_10_10_7_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_hebrew_symbols_shift" />
latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

4
java/res/xml/keyboard_layout_set_spanish.xml
View File

@ -26,10 +26,10 @@
latin:enableProximityCharsCorrection="true" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_spanish_symbols" />
latin:elementKeyboard="@xml/kbd_10_10_7_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_spanish_symbols_shift" />
latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

73
java/res/xml/row_qwerty4.xml
View File

@ -27,75 +27,10 @@
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="15%p" />
<switch>
<case
latin:mode="url"
>
<Key
latin:keyLabel="/"
latin:keyStyle="f1MoreKeysStyle" />
</case>
<case
latin:mode="email"
>
<Key
latin:keyLabel="\@"
latin:keyStyle="f1MoreKeysStyle" />
</case>
<case
latin:hasShortcutKey="true"
>
<Key
latin:keyStyle="shortcutKeyStyle" />
</case>
<!-- latin:hasShortcutKey="false" -->
<default>
<Key
latin:keyLabel="!text/keylabel_for_comma"
latin:keyLabelFlags="hasPopupHint"
latin:additionalMoreKeys="!text/more_keys_for_comma"
latin:keyStyle="f1MoreKeysStyle" />
</default>
</switch>
<switch>
<case
latin:languageCode="fa"
latin:languageSwitchKeyEnabled="true"
>
<Key
latin:keyStyle="languageSwitchKeyStyle" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="30%p" />
<Key
latin:keyStyle="zwnjKeyStyle" />
</case>
<case
latin:languageCode="fa"
latin:languageSwitchKeyEnabled="false"
>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="40%p" />
<Key
latin:keyStyle="zwnjKeyStyle" />
</case>
<case
latin:languageSwitchKeyEnabled="true"
>
<Key
latin:keyStyle="languageSwitchKeyStyle" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="40%p" />
</case>
<!-- languageSwitchKeyEnabled="false" -->
<default>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="50%p" />
</default>
</switch>
<include
latin:keyboardLayout="@xml/key_f1" />
<include
latin:keyboardLayout="@xml/key_space" />
<Key
latin:keyStyle="punctuationKeyStyle" />
<Key

0
java/res/xml/rows_symbols4.xml → java/res/xml/row_symbols4.xml
View File

0
java/res/xml/rows_symbols_shift4.xml → java/res/xml/row_symbols_shift4.xml
View File

2
java/res/xml/rows_symbols.xml
View File

@ -44,5 +44,5 @@
latin:keyboardLayout="@xml/rowkeys_symbols3" />
</Row>
<include
latin:keyboardLayout="@xml/rows_symbols4" />
latin:keyboardLayout="@xml/row_symbols4" />
</merge>

2
java/res/xml/rows_symbols_shift.xml
View File

@ -44,5 +44,5 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
</Row>
<include
latin:keyboardLayout="@xml/rows_symbols_shift4" />
latin:keyboardLayout="@xml/row_symbols_shift4" />
</merge>