Merge "Optimize tablet layout"
Satoshi Kataoka
Android (Google) Code Review
commit
4aad381f4f
|
|
@ -1,27 +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"
|
|
||||||
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
|
|
||||||
>
|
|
||||||
<include
|
|
||||||
latin:keyboardLayout="@xml/rows_10_10_7_symbols" />
|
|
||||||
</Keyboard>
|
|
||||||
|
|
@ -1,27 +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"
|
|
||||||
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
|
|
||||||
>
|
|
||||||
<include
|
|
||||||
latin:keyboardLayout="@xml/rows_10_10_7_symbols_shift" />
|
|
||||||
</Keyboard>
|
|
||||||
|
|
@ -18,10 +18,9 @@
|
||||||
*/
|
*/
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<Keyboard
|
<merge
|
||||||
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
||||||
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
|
|
||||||
>
|
>
|
||||||
<include
|
<include
|
||||||
latin:keyboardLayout="@xml/rows_symbols" />
|
latin:keyboardLayout="@xml/key_space_5kw" />
|
||||||
</Keyboard>
|
</merge>
|
||||||
|
|
@ -21,6 +21,20 @@
|
||||||
<merge
|
<merge
|
||||||
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
||||||
>
|
>
|
||||||
|
<switch>
|
||||||
|
<case
|
||||||
|
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
|
||||||
|
>
|
||||||
|
<key-style
|
||||||
|
latin:styleName="hasShiftedLetterHintStyle"
|
||||||
|
latin:keyLabelFlags="hasShiftedLetterHint|shiftedLetterActivated" />
|
||||||
|
</case>
|
||||||
|
<default>
|
||||||
|
<key-style
|
||||||
|
latin:styleName="hasShiftedLetterHintStyle"
|
||||||
|
latin:keyLabelFlags="hasShiftedLetterHint" />
|
||||||
|
</default>
|
||||||
|
</switch>
|
||||||
<!-- Functional key styles -->
|
<!-- Functional key styles -->
|
||||||
<!-- Base style for shift key. A single space is used for dummy label in moreKeys. -->
|
<!-- Base style for shift key. A single space is used for dummy label in moreKeys. -->
|
||||||
<key-style
|
<key-style
|
||||||
|
|
|
||||||
|
|
@ -1,48 +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.
|
|
||||||
*/
|
|
||||||
-->
|
|
||||||
|
|
||||||
<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" />
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="/" />
|
|
||||||
<include
|
|
||||||
latin:keyboardLayout="@xml/key_f1" />
|
|
||||||
<include
|
|
||||||
latin:keyXPos="28.0%p"
|
|
||||||
latin:keyboardLayout="@xml/key_space_5kw"
|
|
||||||
latin:backgroundType="normal" />
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="""
|
|
||||||
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>
|
|
||||||
|
|
@ -1,40 +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.
|
|
||||||
*/
|
|
||||||
-->
|
|
||||||
|
|
||||||
<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_5kw"
|
|
||||||
latin:backgroundType="normal" />
|
|
||||||
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
|
|
||||||
<Spacer
|
|
||||||
latin:keyWidth="fillRight" />
|
|
||||||
</Row>
|
|
||||||
</merge>
|
|
||||||
|
|
@ -1,75 +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.
|
|
||||||
*/
|
|
||||||
-->
|
|
||||||
|
|
||||||
<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="٬"
|
|
||||||
latin:keyHintLabel="&"
|
|
||||||
latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
|
|
||||||
latin:moreKeys="&" />
|
|
||||||
</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="٫"
|
|
||||||
latin:keyHintLabel="\#"
|
|
||||||
latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
|
|
||||||
latin:moreKeys="\#" />
|
|
||||||
</case>
|
|
||||||
<default>
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="&" />
|
|
||||||
</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="_,–,—,·" />
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="+"
|
|
||||||
latin:moreKeys="!text/more_keys_for_plus" />
|
|
||||||
<include
|
|
||||||
latin:keyboardLayout="@xml/keys_parentheses" />
|
|
||||||
</merge>
|
|
||||||
|
|
@ -1,57 +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.
|
|
||||||
*/
|
|
||||||
-->
|
|
||||||
|
|
||||||
<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="≠,≈" />
|
|
||||||
<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>
|
|
||||||
|
|
@ -1,56 +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.
|
|
||||||
*/
|
|
||||||
-->
|
|
||||||
|
|
||||||
<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="•"
|
|
||||||
latin:moreKeys="!text/more_keys_for_bullet" />
|
|
||||||
<!-- U+221A: "√" SQUARE ROOT -->
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="√" />
|
|
||||||
<!-- U+03C0: "π" GREEK SMALL LETTER PI
|
|
||||||
U+03A0: "Π" GREEK CAPITAL LETTER PI -->
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="π"
|
|
||||||
latin:moreKeys="Π" />
|
|
||||||
<!-- U+00F7: "÷" DIVISION SIGN -->
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="÷" />
|
|
||||||
<!-- U+00D7: "×" MULTIPLICATION SIGN -->
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="×" />
|
|
||||||
<!-- U+00A7: "§" SECTION SIGN
|
|
||||||
U+00B6: "¶" PILCROW SIGN -->
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="§"
|
|
||||||
latin:moreKeys="¶" />
|
|
||||||
<!-- U+0394: "Δ" GREEK CAPITAL LETTER DELTA -->
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="Δ" />
|
|
||||||
</merge>
|
|
||||||
|
|
@ -1,52 +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.
|
|
||||||
*/
|
|
||||||
-->
|
|
||||||
|
|
||||||
<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="↑,↓,←,→" />
|
|
||||||
<!-- U+00B0: "°" DEGREE SIGN
|
|
||||||
U+2032: "′" PRIME
|
|
||||||
U+2033: "″" DOUBLE PRIME -->
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="°"
|
|
||||||
latin:moreKeys="′,″" />
|
|
||||||
<!-- U+00B1: "±" PLUS-MINUS SIGN
|
|
||||||
U+221E: "∞" INFINITY -->
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="±"
|
|
||||||
latin:moreKeys="∞" />
|
|
||||||
<include
|
|
||||||
latin:keyboardLayout="@xml/keys_curly_brackets" />
|
|
||||||
</merge>
|
|
||||||
|
|
@ -1,46 +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.
|
|
||||||
*/
|
|
||||||
-->
|
|
||||||
|
|
||||||
<merge
|
|
||||||
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
|
||||||
>
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="\\" />
|
|
||||||
<!-- U+00A9: "©" COPYRIGHT SIGN -->
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="©" />
|
|
||||||
<!-- U+00AE: "®" REGISTERED SIGN -->
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="®" />
|
|
||||||
<!-- U+2122: "™" TRADE MARK SIGN -->
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="™" />
|
|
||||||
<!-- U+2105: "℅" CARE OF -->
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="℅" />
|
|
||||||
<include
|
|
||||||
latin:keyboardLayout="@xml/keys_square_brackets" />
|
|
||||||
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="¡" />
|
|
||||||
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
|
|
||||||
<Key
|
|
||||||
latin:keyLabel="¿" />
|
|
||||||
</merge>
|
|
||||||
|
|
@ -1,60 +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.
|
|
||||||
*/
|
|
||||||
-->
|
|
||||||
|
|
||||||
<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>
|
|
||||||
|
|
@ -1,60 +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.
|
|
||||||
*/
|
|
||||||
-->
|
|
||||||
|
|
||||||
<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>
|
|
||||||
|
|
@ -50,12 +50,23 @@
|
||||||
<Key
|
<Key
|
||||||
latin:keyStyle="toMoreSymbolKeyStyle"
|
latin:keyStyle="toMoreSymbolKeyStyle"
|
||||||
latin:keyWidth="10.0%p" />
|
latin:keyWidth="10.0%p" />
|
||||||
|
<Key
|
||||||
|
latin:keyLabel="\\" />
|
||||||
|
<Key
|
||||||
|
latin:keyLabel="=" />
|
||||||
<include
|
<include
|
||||||
latin:keyboardLayout="@xml/rowkeys_symbols3" />
|
latin:keyboardLayout="@xml/rowkeys_symbols3" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyStyle="toMoreSymbolKeyStyle"
|
latin:keyStyle="toMoreSymbolKeyStyle"
|
||||||
latin:keyWidth="fillRight" />
|
latin:keyWidth="fillRight" />
|
||||||
</Row>
|
</Row>
|
||||||
<include
|
<Row
|
||||||
latin:keyboardLayout="@xml/row_symbols4" />
|
latin:keyWidth="9.0%p"
|
||||||
|
>
|
||||||
|
<Key
|
||||||
|
latin:keyStyle="toAlphaKeyStyle"
|
||||||
|
latin:keyWidth="10.0%p" />
|
||||||
|
<include
|
||||||
|
latin:keyboardLayout="@xml/row_symbols4" />
|
||||||
|
</Row>
|
||||||
</merge>
|
</merge>
|
||||||
|
|
|
||||||
|
|
@ -52,10 +52,23 @@
|
||||||
latin:keyWidth="10.0%p" />
|
latin:keyWidth="10.0%p" />
|
||||||
<include
|
<include
|
||||||
latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
|
latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
|
||||||
|
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
|
||||||
|
<Key
|
||||||
|
latin:keyLabel="¡" />
|
||||||
|
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
|
||||||
|
<Key
|
||||||
|
latin:keyLabel="¿" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyStyle="backFromMoreSymbolKeyStyle"
|
latin:keyStyle="backFromMoreSymbolKeyStyle"
|
||||||
latin:keyWidth="fillRight" />
|
latin:keyWidth="fillRight" />
|
||||||
</Row>
|
</Row>
|
||||||
<include
|
<Row
|
||||||
latin:keyboardLayout="@xml/row_symbols_shift4" />
|
latin:keyWidth="9.0%p"
|
||||||
|
>
|
||||||
|
<Key
|
||||||
|
latin:keyStyle="toAlphaKeyStyle"
|
||||||
|
latin:keyWidth="10%p" />
|
||||||
|
<include
|
||||||
|
latin:keyboardLayout="@xml/row_symbols_shift4" />
|
||||||
|
</Row>
|
||||||
</merge>
|
</merge>
|
||||||
|
|
|
||||||
|
|
@ -18,10 +18,9 @@
|
||||||
*/
|
*/
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<Keyboard
|
<merge
|
||||||
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
||||||
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
|
|
||||||
>
|
>
|
||||||
<include
|
<include
|
||||||
latin:keyboardLayout="@xml/rows_symbols_shift" />
|
latin:keyboardLayout="@xml/key_space_3kw" />
|
||||||
</Keyboard>
|
</merge>
|
||||||
|
|
@ -26,10 +26,10 @@
|
||||||
latin:enableProximityCharsCorrection="true" />
|
latin:enableProximityCharsCorrection="true" />
|
||||||
<Element
|
<Element
|
||||||
latin:elementName="symbols"
|
latin:elementName="symbols"
|
||||||
latin:elementKeyboard="@xml/kbd_10_10_7_symbols" />
|
latin:elementKeyboard="@xml/kbd_symbols" />
|
||||||
<Element
|
<Element
|
||||||
latin:elementName="symbolsShifted"
|
latin:elementName="symbolsShifted"
|
||||||
latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" />
|
latin:elementKeyboard="@xml/kbd_symbols_shift" />
|
||||||
<Element
|
<Element
|
||||||
latin:elementName="phone"
|
latin:elementName="phone"
|
||||||
latin:elementKeyboard="@xml/kbd_phone" />
|
latin:elementKeyboard="@xml/kbd_phone" />
|
||||||
|
|
|
||||||
|
|
@ -26,10 +26,10 @@
|
||||||
latin:enableProximityCharsCorrection="true" />
|
latin:enableProximityCharsCorrection="true" />
|
||||||
<Element
|
<Element
|
||||||
latin:elementName="symbols"
|
latin:elementName="symbols"
|
||||||
latin:elementKeyboard="@xml/kbd_10_10_7_symbols" />
|
latin:elementKeyboard="@xml/kbd_symbols" />
|
||||||
<Element
|
<Element
|
||||||
latin:elementName="symbolsShifted"
|
latin:elementName="symbolsShifted"
|
||||||
latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" />
|
latin:elementKeyboard="@xml/kbd_symbols_shift" />
|
||||||
<Element
|
<Element
|
||||||
latin:elementName="phone"
|
latin:elementName="phone"
|
||||||
latin:elementKeyboard="@xml/kbd_phone" />
|
latin:elementKeyboard="@xml/kbd_phone" />
|
||||||
|
|
|
||||||
|
|
@ -26,10 +26,10 @@
|
||||||
latin:enableProximityCharsCorrection="true" />
|
latin:enableProximityCharsCorrection="true" />
|
||||||
<Element
|
<Element
|
||||||
latin:elementName="symbols"
|
latin:elementName="symbols"
|
||||||
latin:elementKeyboard="@xml/kbd_10_10_7_symbols" />
|
latin:elementKeyboard="@xml/kbd_symbols" />
|
||||||
<Element
|
<Element
|
||||||
latin:elementName="symbolsShifted"
|
latin:elementName="symbolsShifted"
|
||||||
latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" />
|
latin:elementKeyboard="@xml/kbd_symbols_shift" />
|
||||||
<Element
|
<Element
|
||||||
latin:elementName="phone"
|
latin:elementName="phone"
|
||||||
latin:elementKeyboard="@xml/kbd_phone" />
|
latin:elementKeyboard="@xml/kbd_phone" />
|
||||||
|
|
|
||||||
|
|
@ -26,10 +26,10 @@
|
||||||
latin:enableProximityCharsCorrection="true" />
|
latin:enableProximityCharsCorrection="true" />
|
||||||
<Element
|
<Element
|
||||||
latin:elementName="symbols"
|
latin:elementName="symbols"
|
||||||
latin:elementKeyboard="@xml/kbd_10_10_7_symbols" />
|
latin:elementKeyboard="@xml/kbd_symbols" />
|
||||||
<Element
|
<Element
|
||||||
latin:elementName="symbolsShifted"
|
latin:elementName="symbolsShifted"
|
||||||
latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" />
|
latin:elementKeyboard="@xml/kbd_symbols_shift" />
|
||||||
<Element
|
<Element
|
||||||
latin:elementName="phone"
|
latin:elementName="phone"
|
||||||
latin:elementKeyboard="@xml/kbd_phone" />
|
latin:elementKeyboard="@xml/kbd_phone" />
|
||||||
|
|
|
||||||
|
|
@ -26,10 +26,10 @@
|
||||||
latin:enableProximityCharsCorrection="true" />
|
latin:enableProximityCharsCorrection="true" />
|
||||||
<Element
|
<Element
|
||||||
latin:elementName="symbols"
|
latin:elementName="symbols"
|
||||||
latin:elementKeyboard="@xml/kbd_10_10_7_symbols" />
|
latin:elementKeyboard="@xml/kbd_symbols" />
|
||||||
<Element
|
<Element
|
||||||
latin:elementName="symbolsShifted"
|
latin:elementName="symbolsShifted"
|
||||||
latin:elementKeyboard="@xml/kbd_10_10_7_symbols_shift" />
|
latin:elementKeyboard="@xml/kbd_symbols_shift" />
|
||||||
<Element
|
<Element
|
||||||
latin:elementName="phone"
|
latin:elementName="phone"
|
||||||
latin:elementKeyboard="@xml/kbd_phone" />
|
latin:elementKeyboard="@xml/kbd_phone" />
|
||||||
|
|
|
||||||
|
|
@ -18,39 +18,29 @@
|
||||||
*/
|
*/
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<merge
|
<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
|
||||||
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
|
||||||
>
|
<Key
|
||||||
<Row
|
latin:backgroundType="functional"
|
||||||
latin:keyWidth="10%p"
|
latin:keyLabel="_" />
|
||||||
>
|
<Key
|
||||||
<Key
|
latin:backgroundType="functional"
|
||||||
latin:keyStyle="toAlphaKeyStyle"
|
latin:keyLabel="/" />
|
||||||
latin:keyWidth="15%p" />
|
|
||||||
<Key
|
<switch>
|
||||||
latin:keyLabel="_"
|
<case latin:hasShortcutKey="true" >
|
||||||
latin:backgroundType="functional" />
|
<Key latin:keyStyle="shortcutKeyStyle" />
|
||||||
<Key
|
</case>
|
||||||
latin:keyLabel="/"
|
<!-- latin:hasShortcutKey="false" -->
|
||||||
latin:backgroundType="functional" />
|
<default>
|
||||||
<switch>
|
</default>
|
||||||
<case
|
</switch>
|
||||||
latin:hasShortcutKey="true"
|
|
||||||
>
|
<include latin:keyboardLayout="@xml/key_space_symbols" />
|
||||||
<Key
|
<include latin:keyboardLayout="@xml/keys_comma_period" />
|
||||||
latin:keyStyle="shortcutKeyStyle" />
|
|
||||||
</case>
|
<Key
|
||||||
<!-- latin:hasShortcutKey="false" -->
|
latin:keyStyle="emojiKeyStyle"
|
||||||
<default>
|
latin:keyWidth="fillRight" />
|
||||||
</default>
|
|
||||||
</switch>
|
|
||||||
<include
|
|
||||||
latin:keyXPos="35%p"
|
|
||||||
latin:keyboardLayout="@xml/key_space_3kw" />
|
|
||||||
<include
|
|
||||||
latin:keyboardLayout="@xml/keys_comma_period" />
|
|
||||||
<Key
|
|
||||||
latin:keyStyle="emojiKeyStyle"
|
|
||||||
latin:keyWidth="fillRight" />
|
|
||||||
</Row>
|
|
||||||
</merge>
|
</merge>
|
||||||
|
|
|
||||||
|
|
@ -17,25 +17,15 @@
|
||||||
** limitations under the License.
|
** limitations under the License.
|
||||||
*/
|
*/
|
||||||
-->
|
-->
|
||||||
|
<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
|
||||||
|
|
||||||
|
<include latin:keyboardLayout="@xml/keys_less_greater" />
|
||||||
|
<include
|
||||||
|
latin:keyboardLayout="@xml/key_space_symbols" />
|
||||||
|
<include latin:keyboardLayout="@xml/keys_comma_period" />
|
||||||
|
|
||||||
|
<Key
|
||||||
|
latin:keyStyle="enterKeyStyle"
|
||||||
|
latin:keyWidth="fillRight" />
|
||||||
|
|
||||||
<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" />
|
|
||||||
<include
|
|
||||||
latin:keyboardLayout="@xml/keys_less_greater" />
|
|
||||||
<include
|
|
||||||
latin:keyXPos="35%p"
|
|
||||||
latin:keyboardLayout="@xml/key_space_3kw" />
|
|
||||||
<include
|
|
||||||
latin:keyboardLayout="@xml/keys_comma_period" />
|
|
||||||
<Key
|
|
||||||
latin:keyStyle="enterKeyStyle"
|
|
||||||
latin:keyWidth="fillRight" />
|
|
||||||
</Row>
|
|
||||||
</merge>
|
</merge>
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,7 @@
|
||||||
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
||||||
>
|
>
|
||||||
<Key
|
<Key
|
||||||
latin:keyStyle="moreCurrency1KeyStyle"
|
latin:keyStyle="moreCurrency1KeyStyle" />
|
||||||
latin:keyXPos="5%p" />
|
|
||||||
<Key
|
<Key
|
||||||
latin:keyStyle="moreCurrency2KeyStyle" />
|
latin:keyStyle="moreCurrency2KeyStyle" />
|
||||||
<Key
|
<Key
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,13 @@
|
||||||
latin:keyWidth="fillRight"
|
latin:keyWidth="fillRight"
|
||||||
latin:visualInsetsLeft="1%p" />
|
latin:visualInsetsLeft="1%p" />
|
||||||
</Row>
|
</Row>
|
||||||
<include
|
<Row
|
||||||
latin:keyboardLayout="@xml/row_symbols4" />
|
latin:keyWidth="10%p"
|
||||||
|
>
|
||||||
|
<Key
|
||||||
|
latin:keyStyle="toAlphaKeyStyle"
|
||||||
|
latin:keyWidth="15%p" />
|
||||||
|
<include
|
||||||
|
latin:keyboardLayout="@xml/row_symbols4" />
|
||||||
|
</Row>
|
||||||
</merge>
|
</merge>
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,7 @@
|
||||||
latin:keyWidth="10%p"
|
latin:keyWidth="10%p"
|
||||||
>
|
>
|
||||||
<include
|
<include
|
||||||
|
latin:keyXPos="5%p"
|
||||||
latin:keyboardLayout="@xml/rowkeys_symbols_shift2" />
|
latin:keyboardLayout="@xml/rowkeys_symbols_shift2" />
|
||||||
</Row>
|
</Row>
|
||||||
<Row
|
<Row
|
||||||
|
|
@ -51,6 +52,13 @@
|
||||||
latin:keyWidth="fillRight"
|
latin:keyWidth="fillRight"
|
||||||
latin:visualInsetsLeft="1%p" />
|
latin:visualInsetsLeft="1%p" />
|
||||||
</Row>
|
</Row>
|
||||||
<include
|
<Row
|
||||||
latin:keyboardLayout="@xml/row_symbols_shift4" />
|
latin:keyWidth="10%p"
|
||||||
|
>
|
||||||
|
<Key
|
||||||
|
latin:keyStyle="toAlphaKeyStyle"
|
||||||
|
latin:keyWidth="15%p" />
|
||||||
|
<include
|
||||||
|
latin:keyboardLayout="@xml/row_symbols_shift4" />
|
||||||
|
</Row>
|
||||||
</merge>
|
</merge>
|
||||||
|
|
|
||||||
|
|
@ -383,7 +383,7 @@ public final class KeyboardTextsSet {
|
||||||
// Label for "switch to more symbol" modifier key. Must be short to fit on key!
|
// Label for "switch to more symbol" modifier key. Must be short to fit on key!
|
||||||
/* 124 */ "= \\ <",
|
/* 124 */ "= \\ <",
|
||||||
// Label for "switch to more symbol" modifier key on tablets. Must be short to fit on key!
|
// Label for "switch to more symbol" modifier key on tablets. Must be short to fit on key!
|
||||||
/* 125 */ "~ \\ {",
|
/* 125 */ "~ [ {",
|
||||||
// Label for "Tab" key. Must be short to fit on key!
|
// Label for "Tab" key. Must be short to fit on key!
|
||||||
/* 126 */ "Tab",
|
/* 126 */ "Tab",
|
||||||
// Label for "switch to phone numeric" key. Must be short to fit on key!
|
// Label for "switch to phone numeric" key. Must be short to fit on key!
|
||||||
|
|
|
||||||
|
|
@ -190,7 +190,7 @@
|
||||||
<!-- Label for "switch to more symbol" modifier key. Must be short to fit on key! -->
|
<!-- Label for "switch to more symbol" modifier key. Must be short to fit on key! -->
|
||||||
<string name="label_to_more_symbol_key">= \\ <</string>
|
<string name="label_to_more_symbol_key">= \\ <</string>
|
||||||
<!-- Label for "switch to more symbol" modifier key on tablets. Must be short to fit on key! -->
|
<!-- Label for "switch to more symbol" modifier key on tablets. Must be short to fit on key! -->
|
||||||
<string name="label_to_more_symbol_for_tablet_key">~ \\ {</string>
|
<string name="label_to_more_symbol_for_tablet_key">~ [ {</string>
|
||||||
<!-- Label for "Tab" key. Must be short to fit on key! -->
|
<!-- Label for "Tab" key. Must be short to fit on key! -->
|
||||||
<string name="label_tab_key">Tab</string>
|
<string name="label_tab_key">Tab</string>
|
||||||
<!-- Label for "switch to phone numeric" key. Must be short to fit on key! -->
|
<!-- Label for "switch to phone numeric" key. Must be short to fit on key! -->
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue