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

Revert "Remove symbols shifted layout" 

This reverts commit c02a365485.

Change-Id: I11d31632469a594c0637f035bdd74ba60b2ac33e
main
Satoshi Kataoka 2013-09-04 08:53:12 +00:00
parent e3150664ae
commit e0502496da
54 changed files with 1113 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
java/res/xml-sw600dp/kbd_10_10_7_symbols.xml Normal file
View File

@ -0,0 +1,27 @@
<?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"
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
>
<include
latin:keyboardLayout="@xml/rows_10_10_7_symbols" />
</Keyboard>

27
java/res/xml-sw600dp/kbd_10_10_7_symbols_shift.xml Normal file
View File

@ -0,0 +1,27 @@
<?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"
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
>
<include
latin:keyboardLayout="@xml/rows_10_10_7_symbols_shift" />
</Keyboard>

16
java/res/xml-sw600dp/row_symbols4.xml
View File

@ -28,13 +28,21 @@
<Key
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="10.0%p" />
<Key
latin:keyLabel="/" />
<include
latin:keyboardLayout="@xml/key_f1" />
<include
latin:keyXPos="28.0%p"
latin:keyboardLayout="@xml/key_space"
latin:backgroundType="normal" />
<Spacer />
<Spacer />
<include
latin:keyboardLayout="@xml/key_f2" />
<Key
latin:keyLabel="&quot;"
latin:moreKeys="!text/more_keys_for_tablet_double_quote" />
<Key
latin:keyLabel="_" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer
latin:keyWidth="fillRight" />
</Row>
</merge>

40
java/res/xml-sw600dp/row_symbols_shift4.xml Normal file
View File

@ -0,0 +1,40 @@
<?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"
>
<Row
latin:keyWidth="9.0%p"
latin:backgroundType="functional"
>
<Key
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="10.0%p" />
<!-- Here is empty space. -->
<include
latin:keyXPos="28.0%p"
latin:keyboardLayout="@xml/key_space"
latin:backgroundType="normal" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer
latin:keyWidth="fillRight" />
</Row>
</merge>

75
java/res/xml-sw600dp/rowkeys_symbols2.xml Normal file
View File

@ -0,0 +1,75 @@
<?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"
>
<!-- U+066C: "٬" ARABIC THOUSANDS SEPARATOR -->
<Key
latin:keyLabel="&#x066C;"
latin:keyHintLabel="&amp;"
latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
latin:moreKeys="&amp;" />
</case>
<default>
<Key
latin:keyLabel="\#" />
</default>
</switch>
<Key
latin:keyStyle="currencyKeyStyle" />
<Key
latin:keyLabel="!text/keylabel_for_symbols_percent"
latin:moreKeys="!text/more_keys_for_symbols_percent" />
<switch>
<case
latin:languageCode="fa"
>
<!-- U+066B: "٫" ARABIC DECIMAL SEPARATOR -->
<Key
latin:keyLabel="&#x066B;"
latin:keyHintLabel="\#"
latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
latin:moreKeys="\#" />
</case>
<default>
<Key
latin:keyLabel="&amp;" />
</default>
</switch>
<Key
latin:keyLabel="*"
latin:moreKeys="!text/more_keys_for_star" />
<!-- U+2013: "–" EN DASH
U+2014: "—" EM DASH
U+00B7: "·" MIDDLE DOT -->
<Key
latin:keyLabel="-"
latin:moreKeys="_,&#x2013;,&#x2014;,&#x00B7;" />
<Key
latin:keyLabel="+"
latin:moreKeys="!text/more_keys_for_plus" />
<include
latin:keyboardLayout="@xml/keys_parentheses" />
</merge>

57
java/res/xml-sw600dp/rowkeys_symbols3.xml Normal file
View File

@ -0,0 +1,57 @@
<?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"
>
<include
latin:keyboardLayout="@xml/keys_less_greater" />
<!-- U+2260: "≠" NOT EQUAL TO
U+2248: "≈" ALMOST EQUAL TO -->
<Key
latin:keyLabel="="
latin:moreKeys="&#x2260;,&#x2248;" />
<switch>
<case
latin:mode="url"
>
<Key
latin:keyLabel="\'" />
</case>
<default>
<Key
latin:keyLabel=":" />
</default>
</switch>
<Key
latin:keyLabel="!text/keylabel_for_symbols_semicolon"
latin:moreKeys="!text/more_keys_for_symbols_semicolon" />
<Key
latin:keyLabel="!text/keylabel_for_comma"
latin:moreKeys="!text/more_keys_for_comma" />
<Key
latin:keyLabel="." />
<Key
latin:keyLabel="!"
latin:moreKeys="!text/more_keys_for_symbols_exclamation" />
<Key
latin:keyLabel="!text/keylabel_for_symbols_question"
latin:moreKeys="!text/more_keys_for_symbols_question" />
</merge>

56
java/res/xml-sw600dp/rowkeys_symbols_shift1.xml Normal file
View File

@ -0,0 +1,56 @@
<?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"
>
<Key
latin:keyLabel="~" />
<Key
latin:keyLabel="`" />
<Key
latin:keyLabel="|" />
<!-- U+2022: "•" BULLET -->
<Key
latin:keyLabel="&#x2022;"
latin:moreKeys="!text/more_keys_for_bullet" />
<!-- U+221A: "√" SQUARE ROOT -->
<Key
latin:keyLabel="&#x221A;" />
<!-- U+03C0: "π" GREEK SMALL LETTER PI
U+03A0: "Π" GREEK CAPITAL LETTER PI -->
<Key
latin:keyLabel="&#x03C0;"
latin:moreKeys="&#x03A0;" />
<!-- U+00F7: "÷" DIVISION SIGN -->
<Key
latin:keyLabel="&#x00F7;" />
<!-- U+00D7: "×" MULTIPLICATION SIGN -->
<Key
latin:keyLabel="&#x00D7;" />
<!-- U+00A7: "§" SECTION SIGN
U+00B6: "¶" PILCROW SIGN -->
<Key
latin:keyLabel="&#x00A7;"
latin:moreKeys="&#x00B6;" />
<!-- U+0394: "Δ" GREEK CAPITAL LETTER DELTA -->
<Key
latin:keyLabel="&#x0394;" />
</merge>

52
java/res/xml-sw600dp/rowkeys_symbols_shift2.xml Normal file
View File

@ -0,0 +1,52 @@
<?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"
>
<Key
latin:keyStyle="moreCurrency1KeyStyle" />
<Key
latin:keyStyle="moreCurrency2KeyStyle" />
<Key
latin:keyStyle="moreCurrency3KeyStyle" />
<Key
latin:keyStyle="moreCurrency4KeyStyle" />
<!-- U+2191: "↑" UPWARDS ARROW
U+2193: "↓" DOWNWARDS ARROW
U+2190: "←" LEFTWARDS ARROW
U+2192: "→" RIGHTWARDS ARROW -->
<Key
latin:keyLabel="^"
latin:moreKeys="&#x2191;,&#x2193;,&#x2190;,&#x2192;" />
<!-- U+00B0: "°" DEGREE SIGN
U+2032: "′" PRIME
U+2033: "″" DOUBLE PRIME -->
<Key
latin:keyLabel="&#x00B0;"
latin:moreKeys="&#x2032;,&#x2033;" />
<!-- U+00B1: "±" PLUS-MINUS SIGN
U+221E: "∞" INFINITY -->
<Key
latin:keyLabel="&#x00B1;"
latin:moreKeys="&#x221E;" />
<include
latin:keyboardLayout="@xml/keys_curly_brackets" />
</merge>

46
java/res/xml-sw600dp/rowkeys_symbols_shift3.xml Normal file
View File

@ -0,0 +1,46 @@
<?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"
>
<Key
latin:keyLabel="\\" />
<!-- U+00A9: "©" COPYRIGHT SIGN -->
<Key
latin:keyLabel="&#x00A9;" />
<!-- U+00AE: "®" REGISTERED SIGN -->
<Key
latin:keyLabel="&#x00AE;" />
<!-- U+2122: "™" TRADE MARK SIGN -->
<Key
latin:keyLabel="&#x2122;" />
<!-- U+2105: "℅" CARE OF -->
<Key
latin:keyLabel="&#x2105;" />
<include
latin:keyboardLayout="@xml/keys_square_brackets" />
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
<Key
latin:keyLabel="&#x00A1;" />
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
<Key
latin:keyLabel="&#x00BF;" />
</merge>

60
java/res/xml-sw600dp/rows_10_10_7_symbols.xml Normal file
View File

@ -0,0 +1,60 @@
<?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"
>
<include
latin:keyboardLayout="@xml/key_styles_common" />
<include
latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="9.0%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_symbols1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="9.0%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_symbols2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="9.0%p"
>
<Key
latin:keyStyle="toMoreSymbolKeyStyle"
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_symbols3" />
<Key
latin:keyStyle="toMoreSymbolKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_symbols4" />
</merge>

60
java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml Normal file
View File

@ -0,0 +1,60 @@
<?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"
>
<include
latin:keyboardLayout="@xml/key_styles_common" />
<include
latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="9.0%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_symbols_shift1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="9.0%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_symbols_shift2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="9.0%p"
>
<Key
latin:keyStyle="backFromMoreSymbolKeyStyle"
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
<Key
latin:keyStyle="backFromMoreSymbolKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_symbols_shift4" />
</merge>

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

@ -23,6 +23,8 @@
>
<include
latin:keyboardLayout="@xml/key_styles_common" />
<include
latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="9.0%p"
>
@ -36,22 +38,23 @@
latin:keyWidth="9.0%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_symbols2" />
latin:keyboardLayout="@xml/rowkeys_symbols2"
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
<Row
latin:keyWidth="9.0%p"
>
<Key
latin:keyStyle="toMoreSymbolKeyStyle"
latin:keyWidth="10.0%p" />
<include
latin:keyXPos="1.0%p"
latin:keyboardLayout="@xml/rowkeys_symbols3" />
<Key
latin:keyLabel="," />
<include
latin:keyboardLayout="@xml/key_symbols_period"
latin:backgroundType="normal" />
latin:keyStyle="toMoreSymbolKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_symbols4" />

61
java/res/xml-sw600dp/rows_symbols_shift.xml Normal file
View File

@ -0,0 +1,61 @@
<?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" />
<include
latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="9.0%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_symbols_shift1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="9.0%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_symbols_shift2"
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="9.0%p"
>
<Key
latin:keyStyle="backFromMoreSymbolKeyStyle"
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
<Key
latin:keyStyle="backFromMoreSymbolKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_symbols_shift4" />
</merge>

27
java/res/xml/kbd_10_10_7_symbols_shift.xml Normal file
View File

@ -0,0 +1,27 @@
<?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"
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
>
<include
latin:keyboardLayout="@xml/rows_symbols_shift" />
</Keyboard>

27
java/res/xml/kbd_symbols_shift.xml Normal file
View File

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

27
java/res/xml/kbd_thai_symbols_shift.xml Normal file
View File

@ -0,0 +1,27 @@
<?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"
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
>
<include
latin:keyboardLayout="@xml/rows_symbols_shift" />
</Keyboard>

48
java/res/xml/key_currency.xml → java/res/xml/key_styles_currency.xml
View File

@ -2,7 +2,7 @@
<!--
/*
**
** Copyright 2013, The Android Open Source Project
** 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.
@ -18,7 +18,6 @@
*/
-->
<!-- TODO: Move these definitions to text resources and remove key_currency.xml. -->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
@ -27,7 +26,7 @@
latin:passwordInput="true"
>
<include
latin:keyboardLayout="@xml/key_dollar" />
latin:keyboardLayout="@xml/key_styles_currency_dollar" />
</case>
<!-- Countries using Euro currency, 23 countries as of November 2012.
1. Andorra (ca_AD, ca_ES)
@ -57,7 +56,7 @@
latin:countryCode="AD|AT|BE|CY|EE|FI|FR|DE|GR|IE|IT|XK|LU|MT|MO|ME|NL|PT|SM|SK|SI|ES|VA"
>
<include
latin:keyboardLayout="@xml/key_euro" />
latin:keyboardLayout="@xml/key_styles_currency_euro" />
</case>
<!-- Note: Some subtype locale may not have country code, and it it supposed to indicate the
country where the language originally/mainly spoken. -->
@ -81,7 +80,7 @@
latin:localeCode="da|de|es|el|fi|fr|it|nl|sk|sl|sv|tr"
>
<include
latin:keyboardLayout="@xml/key_euro" />
latin:keyboardLayout="@xml/key_styles_currency_euro" />
</case>
<!-- ca: Catalan (Andorra, Spain)
et: Estonian (Estonia)
@ -91,7 +90,7 @@
latin:languageCode="ca|et|lb|mt"
>
<include
latin:keyboardLayout="@xml/key_euro" />
latin:keyboardLayout="@xml/key_styles_currency_euro" />
</case>
<!-- fa: Persian (Rial and Afgahni)
hi: Hindi (Indian Rupee)
@ -105,9 +104,26 @@
<case
latin:languageCode="fa|hi|iw|mn|th|uk|vi"
>
<Key
<!-- U+00A3: "£" POUND SIGN
U+20AC: "€" EURO SIGN
U+00A2: "¢" CENT SIGN -->
<key-style
latin:styleName="currencyKeyStyle"
latin:keyLabel="!text/keylabel_for_currency"
latin:moreKeys="!text/more_keys_for_currency" />
<key-style
latin:styleName="moreCurrency1KeyStyle"
latin:keyLabel="&#x00A3;" />
<key-style
latin:styleName="moreCurrency2KeyStyle"
latin:keyLabel="&#x20AC;" />
<key-style
latin:styleName="moreCurrency3KeyStyle"
latin:keyLabel="$"
latin:moreKeys="&#x00A2;" />
<key-style
latin:styleName="moreCurrency4KeyStyle"
latin:keyLabel="&#x00A2;" />
</case>
<!-- GB: United Kingdom (Pound) -->
<case
@ -118,14 +134,28 @@
U+00A5: "¥" YEN SIGN
U+00A2: "¢" CENT SIGN
U+20B1: "₱" PESO SIGN -->
<Key
<key-style
latin:styleName="currencyKeyStyle"
latin:keyLabel="&#x00A3;"
latin:moreKeys="&#x00A2;,$,&#x20AC;,&#x00A5;,&#x20B1;" />
<key-style
latin:styleName="moreCurrency1KeyStyle"
latin:keyLabel="&#x20AC;" />
<key-style
latin:styleName="moreCurrency2KeyStyle"
latin:keyLabel="&#x00A5;" />
<key-style
latin:styleName="moreCurrency3KeyStyle"
latin:keyLabel="$"
latin:moreKeys="&#x00A2;" />
<key-style
latin:styleName="moreCurrency4KeyStyle"
latin:keyLabel="&#x00A2;" />
</case>
<!-- ar: Arabic (Dollar and Rial) -->
<default>
<include
latin:keyboardLayout="@xml/key_dollar" />
latin:keyboardLayout="@xml/key_styles_currency_dollar" />
</default>
</switch>
</merge>

17
java/res/xml/key_dollar.xml → java/res/xml/key_styles_currency_dollar.xml
View File

@ -2,7 +2,7 @@
<!--
/*
**
** Copyright 2013, The Android Open Source Project
** 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.
@ -23,7 +23,20 @@
U+00A2: "¢" CENT SIGN
U+20AC: "€" EURO SIGN
U+00A5: "¥" YEN SIGN -->
<Key
<key-style
latin:styleName="currencyKeyStyle"
latin:keyLabel="$"
latin:moreKeys="!text/more_keys_for_currency_dollar" />
<key-style
latin:styleName="moreCurrency1KeyStyle"
latin:keyLabel="&#x00A3;" />
<key-style
latin:styleName="moreCurrency2KeyStyle"
latin:keyLabel="&#x00A2;" />
<key-style
latin:styleName="moreCurrency3KeyStyle"
latin:keyLabel="&#x20AC;" />
<key-style
latin:styleName="moreCurrency4KeyStyle"
latin:keyLabel="&#x00A5;" />
</merge>

18
java/res/xml/key_euro.xml → java/res/xml/key_styles_currency_euro.xml
View File

@ -2,7 +2,7 @@
<!--
/*
**
** Copyright 2013, The Android Open Source Project
** 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.
@ -24,7 +24,21 @@
U+00A3: "£" POUND SIGN
U+00A5: "¥" YEN SIGN
U+20B1: "₱" PESO SIGN -->
<Key
<key-style
latin:styleName="currencyKeyStyle"
latin:keyLabel="&#x20AC;"
latin:moreKeys="&#x00A2;,&#x00A3;,$,&#x00A5;,&#x20B1;" />
<key-style
latin:styleName="moreCurrency1KeyStyle"
latin:keyLabel="&#x00A3;" />
<key-style
latin:styleName="moreCurrency2KeyStyle"
latin:keyLabel="&#x00A5;" />
<key-style
latin:styleName="moreCurrency3KeyStyle"
latin:keyLabel="$"
latin:moreKeys="&#x00A2;" />
<key-style
latin:styleName="moreCurrency4KeyStyle"
latin:keyLabel="&#x00A2;" />
</merge>

3
java/res/xml/keyboard_layout_set_arabic.xml
View File

@ -27,6 +27,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

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

@ -27,6 +27,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_10_10_7_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

3
java/res/xml/keyboard_layout_set_bulgarian.xml
View File

@ -27,6 +27,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

3
java/res/xml/keyboard_layout_set_bulgarian_bds.xml
View File

@ -27,6 +27,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

3
java/res/xml/keyboard_layout_set_colemak.xml
View File

@ -27,6 +27,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_10_10_7_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

3
java/res/xml/keyboard_layout_set_dvorak.xml
View File

@ -27,6 +27,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_10_10_7_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

3
java/res/xml/keyboard_layout_set_east_slavic.xml
View File

@ -27,6 +27,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

3
java/res/xml/keyboard_layout_set_farsi.xml
View File

@ -27,6 +27,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

3
java/res/xml/keyboard_layout_set_georgian.xml
View File

@ -43,6 +43,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

3
java/res/xml/keyboard_layout_set_greek.xml
View File

@ -27,6 +27,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

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

@ -27,6 +27,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_10_10_7_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

3
java/res/xml/keyboard_layout_set_hindi.xml
View File

@ -43,6 +43,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

3
java/res/xml/keyboard_layout_set_mongolian.xml
View File

@ -27,6 +27,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

3
java/res/xml/keyboard_layout_set_nordic.xml
View File

@ -27,6 +27,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

3
java/res/xml/keyboard_layout_set_qwerty.xml
View File

@ -27,6 +27,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

3
java/res/xml/keyboard_layout_set_qwertz.xml
View File

@ -27,6 +27,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

3
java/res/xml/keyboard_layout_set_south_slavic.xml
View File

@ -27,6 +27,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

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

@ -27,6 +27,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_10_10_7_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

3
java/res/xml/keyboard_layout_set_thai.xml
View File

@ -43,6 +43,9 @@
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_thai_symbols" />
<Element
latin:elementName="symbolsShifted"
latin:elementKeyboard="@xml/kbd_thai_symbols_shift" />
<Element
latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" />

32
java/res/xml/keys_parentheses.xml Normal file
View File

@ -0,0 +1,32 @@
<?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"
>
<Key
latin:keyLabel="("
latin:code="!code/key_left_parenthesis"
latin:moreKeys="!text/more_keys_for_left_parenthesis" />
<Key
latin:keyLabel=")"
latin:code="!code/key_right_parenthesis"
latin:moreKeys="!text/more_keys_for_right_parenthesis" />
</merge>

5
java/res/xml/row_symbols4.xml
View File

@ -46,9 +46,8 @@
<include
latin:keyXPos="25%p"
latin:keyboardLayout="@xml/key_space" />
<include
latin:keyboardLayout="@xml/key_symbols_period"
latin:backgroundType="functional" />
<Key
latin:keyStyle="punctuationKeyStyle" />
<Key
latin:keyStyle="emojiKeyStyle"
latin:keyWidth="fillRight" />

47
java/res/xml/row_symbols_shift4.xml Normal file
View File

@ -0,0 +1,47 @@
<?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"
>
<Row
latin:keyWidth="10%p"
>
<Key
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="15%p" />
<!-- U+201A: "‚" SINGLE LOW-9 QUOTATION MARK
U+201E: "„" DOUBLE LOW-9 QUOTATION MARK -->
<Key
latin:keyLabel="&#x201E;"
latin:moreKeys="&#x201A;"
latin:backgroundType="functional" />
<include
latin:keyXPos="25%p"
latin:keyboardLayout="@xml/key_space" />
<!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
<Key
latin:keyLabel="&#x2026;"
latin:backgroundType="functional" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
</merge>

40
java/res/xml/rowkeys_symbols2.xml
View File

@ -43,12 +43,8 @@
latin:keyLabel="\#" />
</default>
</switch>
<!-- TODO: Remove key_currency.xml and uncomment the following definition. -->
<!-- <Key -->
<!-- latin:keyLabel="!text/keylabel_for_currency" -->
<!-- latin:moreKeys="!text/more_keys_for_currency" /> -->
<include
latin:keyboardLayout="@xml/key_currency" />
<Key
latin:keyStyle="currencyKeyStyle" />
<Key
latin:keyLabel="!text/keylabel_for_symbols_percent"
latin:moreKeys="!text/more_keys_for_symbols_percent" />
@ -57,27 +53,15 @@
<Key
latin:keyLabel="*"
latin:moreKeys="!text/more_keys_for_star" />
<!-- U+00B1: "±" PLUS-MINUS SIGN
U+00D7: "×" MULTIPLICATION SIGN
U+00F7: "÷" DIVISION SIGN
U+221A: "√" SQUARE ROOT -->
<Key
<!-- U+2013: "–" EN DASH
U+2014: "—" EM DASH
U+00B7: "·" MIDDLE DOT -->
<Key
latin:keyLabel="-"
latin:moreKeys="_,&#x2013;,&#x2014;,&#x00B7;" />
<Key
latin:keyLabel="+"
latin:moreKeys="!text/more_keys_for_plus,&#x00B1;,&#x00D7;,&#x00F7;,&#x221A;" />
<!-- U+221E: "∞" INFINITY
U+2264: "≤" LESS-THAN OR EQUAL TO
U+2265: "≥" GREATER-THAN EQUAL TO
U+2260: "≠" NOT EQUAL TO
U+2248: "≈" ALMOST EQUAL TO -->
<Key
latin:keyLabel="="
latin:moreKeys="!fixedColumnOrder!5,&#x221E;,&#x2264;,&#x2265;,&#x2260;,&#x2248;" />
<Key
latin:keyLabel="("
latin:code="!code/key_left_parenthesis"
latin:moreKeys="!text/more_keys_for_left_parenthesis" />
<Key
latin:keyLabel=")"
latin:code="!code/key_right_parenthesis"
latin:moreKeys="!text/more_keys_for_right_parenthesis" />
latin:moreKeys="!text/more_keys_for_plus" />
<include
latin:keyboardLayout="@xml/keys_parentheses" />
</merge>

19
java/res/xml/rowkeys_symbols3.xml
View File

@ -24,9 +24,6 @@
<Key
latin:keyLabel="!"
latin:moreKeys="!text/more_keys_for_symbols_exclamation" />
<Key
latin:keyLabel="!text/keylabel_for_symbols_question"
latin:moreKeys="!text/more_keys_for_symbols_question" />
<switch>
<case
latin:languageCode="fa"
@ -36,11 +33,11 @@
<Key
latin:keyLabel="&#x00AB;"
latin:code="0x00BB"
latin:moreKeys="!fixedColumnOrder!6,!text/more_keys_for_double_quote,&quot;" />
latin:moreKeys="!text/more_keys_for_double_quote" />
<Key
latin:keyLabel="&#x00BB;"
latin:code="0x00AB"
latin:moreKeys="!fixedColumnOrder!6,!text/more_keys_for_single_quote,\'" />
latin:moreKeys="!text/more_keys_for_single_quote" />
</case>
<default>
<Key
@ -51,18 +48,14 @@
latin:moreKeys="!text/more_keys_for_single_quote" />
</default>
</switch>
<!-- U+2013: "–" EN DASH
U+2014: "—" EM DASH
U+00B7: "·" MIDDLE DOT -->
<Key
latin:keyLabel="-"
latin:moreKeys="_,~,&#x2013;,&#x2014;,&#x00B7;" />
<Key
latin:keyLabel=":" />
<Key
latin:keyLabel="!text/keylabel_for_symbols_semicolon"
latin:moreKeys="!text/more_keys_for_symbols_semicolon" />
<Key
latin:keyLabel="/"
latin:moreKeys="\\|,\\\\,^" />
latin:keyLabel="/" />
<Key
latin:keyLabel="!text/keylabel_for_symbols_question"
latin:moreKeys="!text/more_keys_for_symbols_question" />
</merge>

50
java/res/xml/rowkeys_symbols_shift1.xml Normal file
View File

@ -0,0 +1,50 @@
<?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"
>
<Key
latin:keyLabel="~" />
<Key
latin:keyLabel="`" />
<Key
latin:keyLabel="|" />
<!-- U+2022: "•" BULLET -->
<Key
latin:keyLabel="&#x2022;"
latin:moreKeys="!text/more_keys_for_bullet" />
<!-- U+221A: "√" SQUARE ROOT -->
<Key
latin:keyLabel="&#x221A;" />
<!-- U+03C0: "π" GREEK SMALL LETTER PI
U+03A0: "Π" GREEK CAPITAL LETTER PI -->
<Key
latin:keyLabel="&#x03C0;"
latin:moreKeys="&#x03A0;" />
<!-- U+00F7: "÷" DIVISION SIGN -->
<Key
latin:keyLabel="&#x00F7;" />
<!-- U+00D7: "×" MULTIPLICATION SIGN -->
<Key
latin:keyLabel="&#x00D7;" />
<include
latin:keyboardLayout="@xml/keys_curly_brackets" />
</merge>

55
java/res/xml/rowkeys_symbols_shift2.xml Normal file
View File

@ -0,0 +1,55 @@
<?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"
>
<Key
latin:keyStyle="nonSpecialBackgroundTabKeyStyle" />
<Key
latin:keyStyle="moreCurrency1KeyStyle" />
<Key
latin:keyStyle="moreCurrency2KeyStyle" />
<Key
latin:keyStyle="moreCurrency3KeyStyle" />
<!-- U+00B0: "°" DEGREE SIGN
U+2032: "′" PRIME
U+2033: "″" DOUBLE PRIME -->
<Key
latin:keyLabel="&#x00B0;"
latin:moreKeys="&#x2032;,&#x2033;" />
<!-- U+2191: "↑" UPWARDS ARROW
U+2193: "↓" DOWNWARDS ARROW
U+2190: "←" LEFTWARDS ARROW
U+2192: "→" RIGHTWARDS ARROW -->
<Key
latin:keyLabel="^"
latin:moreKeys="&#x2191;,&#x2193;,&#x2190;,&#x2192;" />
<Key
latin:keyLabel="_" />
<!-- U+2260: "≠" NOT EQUAL TO
U+2248: "≈" ALMOST EQUAL TO
U+221E: "∞" INFINITY -->
<Key
latin:keyLabel="="
latin:moreKeys="&#x2260;,&#x2248;,&#x221E;" />
<include
latin:keyboardLayout="@xml/keys_square_brackets" />
</merge>

42
java/res/xml/rowkeys_symbols_shift3.xml Normal file
View File

@ -0,0 +1,42 @@
<?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"
>
<!-- U+2122: "™" TRADE MARK SIGN -->
<Key
latin:keyLabel="&#x2122;" />
<!-- U+00AE: "®" REGISTERED SIGN -->
<Key
latin:keyLabel="&#x00AE;" />
<!-- U+00A9: "©" COPYRIGHT SIGN -->
<Key
latin:keyLabel="&#x00A9;" />
<!-- U+00B6: "¶" PILCROW SIGN
U+00A7: "§" SECTION SIGN -->
<Key
latin:keyLabel="&#x00B6;"
latin:moreKeys="&#x00A7;" />
<Key
latin:keyLabel="\\" />
<include
latin:keyboardLayout="@xml/keys_less_greater" />
</merge>

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

@ -23,6 +23,8 @@
>
<include
latin:keyboardLayout="@xml/key_styles_common" />
<include
latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="10.0%p"
>

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

@ -23,6 +23,8 @@
>
<include
latin:keyboardLayout="@xml/key_styles_common" />
<include
latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="9.091%p"
>

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

@ -23,6 +23,8 @@
>
<include
latin:keyboardLayout="@xml/key_styles_common" />
<include
latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="10%p"
>
@ -38,8 +40,11 @@
<Row
latin:keyWidth="10%p"
>
<Key
latin:keyStyle="toMoreSymbolKeyStyle"
latin:keyWidth="15%p"
latin:visualInsetsRight="1%p" />
<include
latin:keyXPos="5%p"
latin:keyboardLayout="@xml/rowkeys_symbols3" />
<Key
latin:keyStyle="deleteKeyStyle"

56
java/res/xml/rows_symbols_shift.xml Normal file
View File

@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2008, 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" />
<include
latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="10%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_symbols_shift1" />
</Row>
<Row
latin:keyWidth="10%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_symbols_shift2" />
</Row>
<Row
latin:keyWidth="10%p"
>
<Key
latin:keyStyle="backFromMoreSymbolKeyStyle"
latin:keyWidth="15%p"
latin:visualInsetsRight="1%p" />
<include
latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"
latin:visualInsetsLeft="1%p" />
</Row>
<include
latin:keyboardLayout="@xml/row_symbols_shift4" />
</merge>

2
java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java
View File

@ -45,8 +45,8 @@ public final class KeyboardState {
public void setAlphabetAutomaticShiftedKeyboard();
public void setAlphabetShiftLockedKeyboard();
public void setAlphabetShiftLockShiftedKeyboard();
public void setSymbolsKeyboard();
public void setEmojiKeyboard();
public void setSymbolsKeyboard();
public void setSymbolsShiftedKeyboard();
/**

6
java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
View File

@ -288,7 +288,8 @@ public final class KeyboardTextsSet {
// U+2666: "♦" BLACK DIAMOND SUIT
// U+2663: "♣" BLACK CLUB SUIT
/* 55 */ "\u266A,\u2665,\u2660,\u2666,\u2663",
/* 56 */ EMPTY,
// U+00B1: "±" PLUS-MINUS SIGN
/* 56 */ "\u00B1",
// The all letters need to be mirrored are found at
// http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt
/* 57 */ "!fixedColumnOrder!3,<,{,[",
@ -1922,8 +1923,9 @@ public final class KeyboardTextsSet {
// U+2605: "★" BLACK STAR
/* 54 */ "\u2605",
/* 55 */ null,
// U+00B1: "±" PLUS-MINUS SIGN
// U+FB29: "﬩" HEBREW LETTER ALTERNATIVE PLUS SIGN
/* 56 */ "\uFB29",
/* 56 */ "\u00B1,\uFB29",
// The all letters need to be mirrored are found at
// http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt
/* 57 */ "!fixedColumnOrder!3,<|>,{|},[|]",

5
tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml
View File

@ -25,8 +25,9 @@
<string name="label_to_alpha_key">&#x05D0;&#x05D1;&#x05D2;</string>
<!-- U+2605: "★" BLACK STAR -->
<string name="more_keys_for_star">&#x2605;</string>
<!-- U+FB29: "﬩" HEBREW LETTER ALTERNATIVE PLUS SIGN -->
<string name="more_keys_for_plus">&#xFB29;</string>
<!-- U+00B1: "±" PLUS-MINUS SIGN
U+FB29: "﬩" HEBREW LETTER ALTERNATIVE PLUS SIGN -->
<string name="more_keys_for_plus">&#x00B1;,&#xFB29;</string>
<!-- The all letters need to be mirrored are found at
http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
<string name="more_keys_for_left_parenthesis">!fixedColumnOrder!3,&lt;|&gt;,{|},[|]</string>

3
tools/make-keyboard-text/res/values/donottranslate-more-keys.xml
View File

@ -88,7 +88,8 @@
U+2666: "♦" BLACK DIAMOND SUIT
U+2663: "♣" BLACK CLUB SUIT -->
<string name="more_keys_for_bullet">&#x266A;,&#x2665;,&#x2660;,&#x2666;,&#x2663;</string>
<string name="more_keys_for_plus"></string>
<!-- U+00B1: "±" PLUS-MINUS SIGN -->
<string name="more_keys_for_plus">&#x00B1;</string>
<!-- The all letters need to be mirrored are found at
http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->
<string name="more_keys_for_left_parenthesis">!fixedColumnOrder!3,&lt;,{,[</string>