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

Clean up PC QWERTY keyboard 

Change-Id: Ibb52683e8f27517b9e7bf398d3b7a31215bd5a8d
main
Tadashi G. Takaoka 2013-08-23 22:28:26 +09:00
parent 59f49b3861
commit 7f28b3cc6a
28 changed files with 366 additions and 772 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
java/res/xml-sw600dp/keys_pcqwerty2_right3.xml
View File

@ -23,36 +23,32 @@
> >
<switch> <switch>
<case <case
latin:keyboardLayoutSetElement="symbols" latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
> >
<Key
latin:keyLabel="["
latin:moreKeys="{" />
<Key
latin:keyLabel="]"
latin:moreKeys="}" />
<!-- U+00A6: "¦" BROKEN BAR -->
<Key
latin:keyLabel="\\"
latin:moreKeys="\\|,&#x00A6;" />
</case>
<default>
<Key <Key
latin:keyLabel="[" latin:keyLabel="["
latin:keyHintLabel="{" latin:keyHintLabel="{"
latin:moreKeys="{" latin:additionalMoreKeys="{"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:keyStyle="hasShiftedLetterHintStyle" />
<Key <Key
latin:keyLabel="]" latin:keyLabel="]"
latin:keyHintLabel="}" latin:keyHintLabel="}"
latin:moreKeys="}" latin:additionalMoreKeys="}"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:keyStyle="hasShiftedLetterHintStyle" />
<!-- U+00A6: "¦" BROKEN BAR -->
<Key <Key
latin:keyLabel="\\" latin:keyLabel="\\"
latin:keyHintLabel="|" latin:keyHintLabel="|"
latin:moreKeys="\\|,&#x00A6;" latin:additionalMoreKeys="\\|"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<Key
latin:keyLabel="{" />
<Key
latin:keyLabel="}" />
<Key
latin:keyLabel="|" />
</default> </default>
</switch> </switch>
</merge> </merge>

25
java/res/xml-sw600dp/keys_pcqwerty3_right2.xml
View File

@ -23,26 +23,27 @@
> >
<switch> <switch>
<case <case
latin:keyboardLayoutSetElement="symbols" latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
> >
<Key
latin:keyLabel=";"
latin:moreKeys=":" />
<Key
latin:keyLabel="\'"
latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" />
</case>
<default>
<Key <Key
latin:keyLabel=";" latin:keyLabel=";"
latin:keyHintLabel=":" latin:keyHintLabel=":"
latin:moreKeys=":" latin:additionalMoreKeys=":"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:keyStyle="hasShiftedLetterHintStyle" />
<Key <Key
latin:keyLabel="\'" latin:keyLabel="\'"
latin:keyHintLabel="&quot;" latin:keyHintLabel="&quot;"
latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,&quot;,!text/single_quotes" latin:additionalMoreKeys="&quot;"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,%,!text/single_quotes" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<Key
latin:keyLabel=":" />
<Key
latin:keyLabel="&quot;"
latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" />
</default> </default>
</switch> </switch>
</merge> </merge>

44
java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
View File

@ -23,28 +23,26 @@
> >
<switch> <switch>
<case <case
latin:keyboardLayoutSetElement="symbols" latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
> >
<!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK <Key
U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
U+2264: "≤" LESS-THAN OR EQUAL TO
U+2265: "≥" GREATER-THAN EQUAL TO
U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
<Key
latin:keyLabel="," latin:keyLabel=","
latin:keyHintLabel="&lt;"
latin:additionalMoreKeys="&lt;" latin:additionalMoreKeys="&lt;"
latin:moreKeys="!fixedColumnOrder!4,&#x2039;,&#x2064;,&#x00AB;" /> latin:keyStyle="hasShiftedLetterHintStyle" />
<Key <Key
latin:keyLabel="." latin:keyLabel="."
latin:keyHintLabel="&gt;"
latin:additionalMoreKeys="&gt;" latin:additionalMoreKeys="&gt;"
latin:moreKeys="!fixedColumnOrder!4,&#x203A;,&#x2065;,&#x00BB;" /> latin:keyStyle="hasShiftedLetterHintStyle" />
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
<Key <Key
latin:keyLabel="/" latin:keyLabel="/"
latin:keyHintLabel="\?"
latin:additionalMoreKeys="\?" latin:additionalMoreKeys="\?"
latin:moreKeys="&#x00BF;" /> latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_question" />
</case> </case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default> <default>
<!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK <!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
@ -53,24 +51,14 @@
U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK --> U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
<Key <Key
latin:keyLabel="," latin:keyLabel="&lt;"
latin:keyHintLabel="&lt;" latin:moreKeys="!fixedColumnOrder!3,&#x2039;,&#x2264;,&#x00AB;" />
latin:additionalMoreKeys="&lt;"
latin:moreKeys="!fixedColumnOrder!4,&#x2039;,&#x2264;,&#x00AB;"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key <Key
latin:keyLabel="." latin:keyLabel="&gt;"
latin:keyHintLabel="&gt;" latin:moreKeys="!fixedColumnOrder!3,&#x203A;,&#x2265;,&#x00BB;" />
latin:additionalMoreKeys="&gt;"
latin:moreKeys="!fixedColumnOrder!4,&#x203A;,&#x2265;,&#x00BB;"
latin:keyStyle="hasShiftedLetterHintStyle" />
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
<Key <Key
latin:keyLabel="/" latin:keyLabel="\?"
latin:keyHintLabel="\?" latin:moreKeys="!text/more_keys_for_symbols_question" />
latin:additionalMoreKeys="\?"
latin:moreKeys="&#x00BF;"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default> </default>
</switch> </switch>
</merge> </merge>

22
java/res/xml-sw600dp/row_pcqwerty5.xml
View File

@ -38,9 +38,23 @@
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyXPos="25.5%p" latin:keyXPos="25.5%p"
latin:keyWidth="49.0%p" /> latin:keyWidth="49.0%p" />
<include <switch>
latin:keyXPos="-9.0%p" <case
latin:keyWidth="fillRight" latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
latin:keyboardLayout="@xml/key_shortcut" /> >
<include
latin:keyXPos="-9.0%p"
latin:keyWidth="9.0%p"
latin:keyboardLayout="@xml/key_shortcut" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<include
latin:keyXPos="-9.0%p"
latin:keyWidth="9.0%p"
latin:backgroundType="functional"
latin:keyboardLayout="@xml/key_symbols_period" />
</default>
</switch>
</Row> </Row>
</merge> </merge>

172
java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
View File

@ -21,93 +21,87 @@
<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> <Key
<case latin:keyLabel="`"
latin:keyboardLayoutSetElement="symbols" latin:keyHintLabel="~"
> latin:additionalMoreKeys="~"
<include latin:keyStyle="hasShiftedLetterHintStyle" />
latin:keyboardLayout="@xml/keys_pcqwerty_symbols1" /> <Key
</case> latin:keyLabel="1"
<!-- keyboardLayoutSetElement="alphabet*" --> latin:keyHintLabel="!"
<default> latin:additionalMoreKeys="!"
<!-- U+00AC: "¬" NOT SIGN --> latin:keyStyle="hasShiftedLetterHintStyle"
<Key latin:moreKeys="!text/more_keys_for_symbols_exclamation,!text/more_keys_for_symbols_1" />
latin:keyLabel="`" <Key
latin:keyHintLabel="~" latin:keyLabel="2"
latin:additionalMoreKeys="~" latin:keyHintLabel="\@"
latin:moreKeys="&#x00AC;" latin:additionalMoreKeys="\@"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:keyStyle="hasShiftedLetterHintStyle"
<!-- U+00A1: "¡" NVERTED EXCLAMATION MARK --> latin:moreKeys="!text/more_keys_for_symbols_2" />
<Key <Key
latin:keyLabel="1" latin:keyLabel="3"
latin:keyHintLabel="!" latin:keyHintLabel="\#"
latin:additionalMoreKeys="!" latin:additionalMoreKeys="\#"
latin:moreKeys="&#x00A1;,!text/more_keys_for_symbols_1" latin:keyStyle="hasShiftedLetterHintStyle"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:moreKeys="!text/more_keys_for_symbols_3" />
<Key <Key
latin:keyLabel="2" latin:keyLabel="4"
latin:keyHintLabel="\@" latin:keyHintLabel="$"
latin:additionalMoreKeys="\@" latin:additionalMoreKeys="$"
latin:moreKeys="!text/more_keys_for_symbols_2" latin:keyStyle="hasShiftedLetterHintStyle"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:moreKeys="!text/more_keys_for_symbols_4" />
<Key <Key
latin:keyLabel="3" latin:keyLabel="5"
latin:keyHintLabel="\#" latin:keyHintLabel="%"
latin:additionalMoreKeys="\#" latin:additionalMoreKeys="\\%"
latin:moreKeys="!text/more_keys_for_symbols_3" latin:keyStyle="hasShiftedLetterHintStyle"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:moreKeys="!text/more_keys_for_symbols_5" />
<Key <Key
latin:keyLabel="4" latin:keyLabel="6"
latin:keyHintLabel="$" latin:keyHintLabel="^"
latin:additionalMoreKeys="$" latin:additionalMoreKeys="^"
latin:moreKeys="!text/more_keys_for_symbols_4" latin:keyStyle="hasShiftedLetterHintStyle"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:moreKeys="!text/more_keys_for_symbols_6" />
<Key <Key
latin:keyLabel="5" latin:keyLabel="7"
latin:keyHintLabel="%" latin:keyHintLabel="&amp;"
latin:additionalMoreKeys="\\%" latin:additionalMoreKeys="&amp;"
latin:moreKeys="!text/more_keys_for_symbols_5" latin:keyStyle="hasShiftedLetterHintStyle"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:moreKeys="!text/more_keys_for_symbols_7" />
<Key <Key
latin:keyLabel="6" latin:keyLabel="8"
latin:keyHintLabel="^" latin:keyHintLabel="*"
latin:additionalMoreKeys="^" latin:additionalMoreKeys="*"
latin:moreKeys="!text/more_keys_for_symbols_6" latin:keyStyle="hasShiftedLetterHintStyle"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:moreKeys="!text/more_keys_for_symbols_8" />
<Key <Key
latin:keyLabel="7" latin:keyLabel="9"
latin:keyHintLabel="&amp;" latin:keyHintLabel="("
latin:additionalMoreKeys="&amp;" latin:additionalMoreKeys="("
latin:moreKeys="!text/more_keys_for_symbols_7" latin:keyStyle="hasShiftedLetterHintStyle"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:moreKeys="!text/more_keys_for_symbols_9" />
<Key <Key
latin:keyLabel="8" latin:keyLabel="0"
latin:keyHintLabel="*" latin:keyHintLabel=")"
latin:additionalMoreKeys="*" latin:additionalMoreKeys=")"
latin:moreKeys="!text/more_keys_for_symbols_8" latin:keyStyle="hasShiftedLetterHintStyle"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:moreKeys="!text/more_keys_for_symbols_0" />
<Key <!-- U+2013: "–" EN DASH
latin:keyLabel="9" U+2014: "—" EM DASH
latin:keyHintLabel="(" U+00B7: "·" MIDDLE DOT -->
latin:additionalMoreKeys="(" <Key
latin:moreKeys="!text/more_keys_for_symbols_9" latin:keyLabel="-"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:keyHintLabel="_"
<Key latin:additionalMoreKeys="_"
latin:keyLabel="0" latin:keyStyle="hasShiftedLetterHintStyle"
latin:keyHintLabel=")" latin:moreKeys="&#x2013;,&#x2014;,&#x00B7;" />
latin:additionalMoreKeys=")" <!-- U+221E: "∞" INFINITY
latin:moreKeys="!text/more_keys_for_symbols_0" U+2260: "≠" NOT EQUAL TO
latin:keyStyle="hasShiftedLetterHintStyle" /> U+2248: "≈" ALMOST EQUAL TO -->
<Key <Key
latin:keyLabel="-" latin:keyLabel="="
latin:keyHintLabel="_" latin:keyHintLabel="+"
latin:moreKeys="_" latin:additionalMoreKeys="+"
latin:keyStyle="hasShiftedLetterHintStyle" /> latin:keyStyle="hasShiftedLetterHintStyle"
<Key latin:moreKeys="&#x221E;,&#x2260;,&#x2248;" />
latin:keyLabel="="
latin:keyHintLabel="+"
latin:moreKeys="+"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
</merge> </merge>

19
java/res/xml-sw600dp/rows_pcqwerty.xml
View File

@ -26,8 +26,19 @@
<Row <Row
latin:keyWidth="7.0%p" latin:keyWidth="7.0%p"
> >
<include <switch>
latin:keyboardLayout="@xml/rowkeys_pcqwerty1" /> <case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" />
</default>
</switch>
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
@ -44,9 +55,7 @@
<Row <Row
latin:keyWidth="7.0%p" latin:keyWidth="7.0%p"
> >
<Key <Spacer
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabel="!text/label_to_symbol_key_pcqwerty"
latin:keyWidth="12.0%p" /> latin:keyWidth="12.0%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_pcqwerty3" /> latin:keyboardLayout="@xml/rowkeys_pcqwerty3" />

65
java/res/xml-sw600dp/rows_pcqwerty_symbols.xml
View File

@ -1,65 +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" />
<Row
latin:keyWidth="7.0%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="7.0%p"
>
<Key
latin:keyStyle="tabKeyStyle"
latin:keyWidth="9.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty2" />
</Row>
<Row
latin:keyWidth="7.0%p"
>
<Key
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="12.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty3" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="7.0%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty4"
latin:keyXPos="15.0%p" />
</Row>
<include
latin:keyboardLayout="@xml/row_pcqwerty5" />
</merge>

42
java/res/xml-sw768dp/row_pcqwerty5.xml
View File

@ -24,36 +24,34 @@
<Row <Row
latin:keyWidth="8.047%p" latin:keyWidth="8.047%p"
> >
<include
latin:keyboardLayout="@xml/key_settings" />
<switch> <switch>
<case <case
latin:keyboardLayoutSetElement="symbols" latin:languageSwitchKeyEnabled="true"
>
<Spacer
latin:keyXPos="15.0%p"
latin:keyWidth="10.5%p" />
</case>
<case
latin:mode="email|url"
> >
<Key <Key
latin:keyStyle="comKeyStyle" latin:keyStyle="languageSwitchKeyStyle"
latin:keyXPos="15.0%p" latin:backgroundType="functional" />
latin:keyWidth="10.5%p" />
</case> </case>
<default>
<Spacer
latin:keyXPos="15.0%p"
latin:keyWidth="10.5%p" />
</default>
</switch> </switch>
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyXPos="25.5%p"
latin:keyWidth="49.0%p" /> latin:keyWidth="49.0%p" />
<include <switch>
latin:keyXPos="-8.047%p" <case
latin:keyWidth="fillRight" latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
latin:keyboardLayout="@xml/key_shortcut" /> >
<include
latin:keyXPos="-8.047%p"
latin:keyboardLayout="@xml/key_shortcut" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<include
latin:keyXPos="-8.047%p"
latin:backgroundType="functional"
latin:keyboardLayout="@xml/key_symbols_period" />
</default>
</switch>
</Row> </Row>
</merge> </merge>

19
java/res/xml-sw768dp/rows_pcqwerty.xml
View File

@ -26,8 +26,19 @@
<Row <Row
latin:keyWidth="7.0%p" latin:keyWidth="7.0%p"
> >
<include <switch>
latin:keyboardLayout="@xml/rowkeys_pcqwerty1" /> <case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" />
</default>
</switch>
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
@ -44,9 +55,7 @@
<Row <Row
latin:keyWidth="7.0%p" latin:keyWidth="7.0%p"
> >
<Key <Spacer
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabel="!text/label_to_symbol_key_pcqwerty"
latin:keyWidth="12.0%p" /> latin:keyWidth="12.0%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_pcqwerty3" /> latin:keyboardLayout="@xml/rowkeys_pcqwerty3" />

65
java/res/xml-sw768dp/rows_pcqwerty_symbols.xml
View File

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2011, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.0%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="7.0%p"
>
<Key
latin:keyStyle="tabKeyStyle"
latin:keyWidth="9.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty2" />
</Row>
<Row
latin:keyWidth="7.0%p"
>
<Key
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="12.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty3" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="7.0%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty4"
latin:keyXPos="15.0%p" />
</Row>
<include
latin:keyboardLayout="@xml/row_pcqwerty5" />
</merge>

31
java/res/xml/kbd_pcqwerty_symbols.xml
View File

@ -1,31 +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:rowHeight="20%p"
latin:verticalGap="@fraction/key_bottom_gap_5row"
latin:keyLetterSize="@fraction/key_letter_ratio_5row"
latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row"
latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
>
<include
latin:keyboardLayout="@xml/rows_pcqwerty_symbols" />
</Keyboard>

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

@ -24,9 +24,6 @@
latin:elementName="alphabet" latin:elementName="alphabet"
latin:elementKeyboard="@xml/kbd_pcqwerty" latin:elementKeyboard="@xml/kbd_pcqwerty"
latin:enableProximityCharsCorrection="true" /> latin:enableProximityCharsCorrection="true" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_pcqwerty_symbols" />
<Element <Element
latin:elementName="phone" latin:elementName="phone"
latin:elementKeyboard="@xml/kbd_phone" /> latin:elementKeyboard="@xml/kbd_phone" />

13
java/res/xml/keys_pcqwerty2_right3.xml
View File

@ -27,25 +27,22 @@
> >
<Key <Key
latin:keyLabel="[" latin:keyLabel="["
latin:moreKeys="{" /> latin:additionalMoreKeys="{" />
<Key <Key
latin:keyLabel="]" latin:keyLabel="]"
latin:moreKeys="}" /> latin:additionalMoreKeys="}" />
<!-- U+00A6: "¦" BROKEN BAR -->
<Key <Key
latin:keyLabel="\\" latin:keyLabel="\\"
latin:moreKeys="\\|,&#x00A6;" /> latin:additionalMoreKeys="\\|" />
</case> </case>
<!-- keyboardLayoutSetElement="alphabet*Shifted|symbols*" --> <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default> <default>
<Key <Key
latin:keyLabel="{" /> latin:keyLabel="{" />
<Key <Key
latin:keyLabel="}" /> latin:keyLabel="}" />
<!-- U+00A6: "¦" BROKEN BAR -->
<Key <Key
latin:keyLabel="|" latin:keyLabel="|" />
latin:moreKeys="&#x00A6;" />
</default> </default>
</switch> </switch>
</merge> </merge>

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

@ -27,12 +27,13 @@
> >
<Key <Key
latin:keyLabel=";" latin:keyLabel=";"
latin:moreKeys=":" /> latin:additionalMoreKeys=":" />
<Key <Key
latin:keyLabel="\'" latin:keyLabel="\'"
latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,&quot;,!text/single_quotes" /> latin:additionalMoreKeys="&quot;"
latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,%,!text/single_quotes" />
</case> </case>
<!-- keyboardLayoutSetElement="alphabet*Shifted|symbols*" --> <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default> <default>
<Key <Key
latin:keyLabel=":" /> latin:keyLabel=":" />

13
java/res/xml/keys_pcqwerty4_right3.xml
View File

@ -27,16 +27,16 @@
> >
<Key <Key
latin:keyLabel="," latin:keyLabel=","
latin:moreKeys="&lt;" /> latin:additionalMoreKeys="&lt;" />
<Key <Key
latin:keyLabel="." latin:keyLabel="."
latin:moreKeys="&gt;" /> latin:additionalMoreKeys="&gt;" />
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
<Key <Key
latin:keyLabel="/" latin:keyLabel="/"
latin:moreKeys="\?,&#x00BF;" /> latin:additionalMoreKeys="\?"
latin:moreKeys="!text/more_keys_for_symbols_question" />
</case> </case>
<!-- keyboardLayoutSetElement="alphabet*Shifted|symbols*" --> <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default> <default>
<!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK <!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
@ -50,10 +50,9 @@
<Key <Key
latin:keyLabel="&gt;" latin:keyLabel="&gt;"
latin:moreKeys="!fixedColumnOrder!3,&#x203A;,&#x2265;,&#x00BB;" /> latin:moreKeys="!fixedColumnOrder!3,&#x203A;,&#x2265;,&#x00BB;" />
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
<Key <Key
latin:keyLabel="\?" latin:keyLabel="\?"
latin:moreKeys="&#x00BF;" /> latin:moreKeys="!text/more_keys_for_symbols_question" />
</default> </default>
</switch> </switch>
</merge> </merge>

59
java/res/xml/keys_pcqwerty_symbols2.xml
View File

@ -1,59 +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"
>
<!-- U+2022: "•" BULLET -->
<Key
latin:keyLabel="&#x2022;"
latin:moreKeys="!text/more_keys_for_bullet" />
<!-- U+00B1: "±" PLUS-MINUS SIGN -->
<Key
latin:keyLabel="&#x00B1;" />
<!-- U+00AC: "¬" NOT SIGN -->
<Key
latin:keyLabel="&#x00AC;" />
<!-- U+00A6: "¦" BROKEN BAR -->
<Key
latin:keyLabel="&#x00A6;" />
<!-- 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+03CC: "σ" GREEK SMALL LETTER SIGMA
U+03A3: "Σ" GREEK CAPITAL LETTER SIGMA -->
<Key
latin:keyLabel="&#x03C3;"
latin:moreKeys="&#x03A3;" />
<!-- U+00B5: "µ" MICRO SIGN -->
<Key
latin:keyLabel="&#x00B5;" />
<!-- U+00F7: "÷" DIVISION SIGN -->
<Key
latin:keyLabel="&#x00F7;" />
<!-- U+00D7: "×" MULTIPLICATION SIGN -->
<Key
latin:keyLabel="&#x00D7;" />
</merge>

54
java/res/xml/keys_pcqwerty_symbols3.xml
View File

@ -1,54 +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"
>
<!-- U+00A3: "£" POUND SIGN; -->
<Key
latin:keyLabel="&#x00A3;" />
<!-- U+00A2: "¢" CENT SIGN -->
<Key
latin:keyLabel="&#x00A2;" />
<!-- U+20AC: "€" EURO SIGN -->
<Key
latin:keyLabel="&#x20AC;" />
<!-- U+00A5: "¥" YEN SIGN -->
<Key
latin:keyLabel="&#x00A5;" />
<!-- U+00A4: "¤" CURRENCY SIGN -->
<Key
latin:keyLabel="&#x00A4;" />
<!-- U+00B0: "°" DEGREE SIGN
U+2032: "′" PRIME
U+2033: "″" DOUBLE PRIME -->
<Key
latin:keyLabel="&#x00B0;"
latin:moreKeys="&#x2032;,&#x2033;" />
<!-- U+2260: "≠" NOT EQUAL TO -->
<Key
latin:keyLabel="&#x2260;" />
<!-- U+2248: "≈" ALMOST EQUAL TO -->
<Key
latin:keyLabel="&#x2248;" />
<!-- U+221E: "∞" INFINITY -->
<Key
latin:keyLabel="&#x221E;" />
</merge>

49
java/res/xml/keys_pcqwerty_symbols4.xml
View File

@ -1,49 +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"
>
<!-- 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 -->
<Key
latin:keyLabel="&#x00B6;" />
<!-- U+00A7: "§" SECTION SIGN -->
<Key
latin:keyLabel="&#x00A7;" />
<!-- U+2191: "↑" UPWARDS ARROW
U+2193: "↓" DOWNWARDS ARROW
U+2190: "←" LEFTWARDS ARROW
U+2192: "→" RIGHTWARDS ARROW -->
<Key
latin:keyLabel="&#x2191;"
latin:moreKeys="&#x2193;" />
<Key
latin:keyLabel="&#x2190;"
latin:moreKeys="&#x2192;" />
</merge>

55
java/res/xml/row_pcqwerty5.xml
View File

@ -24,36 +24,23 @@
<Row <Row
latin:keyWidth="7.692%p" latin:keyWidth="7.692%p"
> >
<switch> <Spacer
<case latin:keyWidth="11.538%p" />
latin:keyboardLayoutSetElement="symbols"
>
<Key
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="11.538%p" />
</case>
<!-- keyboardLayoutSetElement="alphabet*" -->
<default>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyIcon="!icon/undefined"
latin:keyLabel="!text/label_to_symbol_key_pcqwerty"
latin:keyWidth="11.538%p" />
</default>
</switch>
<switch> <switch>
<case <case
latin:shortcutKeyEnabled="true" latin:shortcutKeyEnabled="true"
> >
<Key <Key
latin:keyStyle="shortcutKeyStyle" /> latin:keyStyle="shortcutKeyStyle"
</case> latin:keyWidth="11.538%p" />
</case>
<case <case
latin:clobberSettingsKey="false" latin:clobberSettingsKey="false"
> >
<Key <Key
latin:keyStyle="settingsKeyStyle" /> latin:keyStyle="settingsKeyStyle"
</case> latin:keyWidth="11.538%p" />
</case>
</switch> </switch>
<switch> <switch>
<case <case
@ -61,21 +48,33 @@
> >
<Key <Key
latin:keyStyle="languageSwitchKeyStyle" latin:keyStyle="languageSwitchKeyStyle"
latin:keyXPos="19.230%p" /> latin:keyWidth="11.538%p" />
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="53.844%p" /> latin:keyWidth="42.310%p" />
</case> </case>
<!-- languageSwitchKeyEnabled="false" --> <!-- languageSwitchKeyEnabled="false" -->
<default> <default>
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyXPos="19.230%p" latin:keyWidth="53.848%p" />
latin:keyWidth="61.536%p" />
</default> </default>
</switch> </switch>
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="defaultEnterKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="15.384%p" />
<switch>
<case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
>
<Spacer />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<include
latin:keyboardLayout="@xml/key_symbols_period"
latin:backgroundType="functional" />
</default>
</switch>
</Row> </Row>
</merge> </merge>

120
java/res/xml/rowkeys_pcqwerty1.xml
View File

@ -21,67 +21,61 @@
<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> <Key
<case latin:keyLabel="`"
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" latin:additionalMoreKeys="~" />
> <Key
<!-- U+00AC: "¬" NOT SIGN --> latin:keyLabel="1"
<Key latin:additionalMoreKeys="!,!text/more_keys_for_symbols_exclamation"
latin:keyLabel="`" latin:moreKeys="!text/more_keys_for_symbols_1" />
latin:moreKeys="~" <Key
latin:additionalMoreKeys="&#x00AC;" /> latin:keyLabel="2"
<!-- U+00A1: "¡" NVERTED EXCLAMATION MARK --> latin:additionalMoreKeys="\@"
<Key latin:moreKeys="!text/more_keys_for_symbols_2" />
latin:keyLabel="1" <Key
latin:additionalMoreKeys="!" latin:keyLabel="3"
latin:moreKeys="&#x00A1;,!text/more_keys_for_symbols_1" /> latin:additionalMoreKeys="\#"
<Key latin:moreKeys="!text/more_keys_for_symbols_3" />
latin:keyLabel="2" <Key
latin:additionalMoreKeys="\@" latin:keyLabel="4"
latin:moreKeys="!text/more_keys_for_symbols_2" /> latin:additionalMoreKeys="$"
<Key latin:moreKeys="!text/more_keys_for_symbols_4" />
latin:keyLabel="3" <Key
latin:additionalMoreKeys="\#" latin:keyLabel="5"
latin:moreKeys="!text/more_keys_for_symbols_3" /> latin:additionalMoreKeys="\\%"
<Key latin:moreKeys="!text/more_keys_for_symbols_5" />
latin:keyLabel="4" <Key
latin:additionalMoreKeys="$" latin:keyLabel="6"
latin:moreKeys="!text/more_keys_for_symbols_4" /> latin:additionalMoreKeys="^"
<Key latin:moreKeys="!text/more_keys_for_symbols_6" />
latin:keyLabel="5" <Key
latin:additionalMoreKeys="\\%" latin:keyLabel="7"
latin:moreKeys="!text/more_keys_for_symbols_5" /> latin:additionalMoreKeys="&amp;"
<Key latin:moreKeys="!text/more_keys_for_symbols_7" />
latin:keyLabel="6" <Key
latin:additionalMoreKeys="^" latin:keyLabel="8"
latin:moreKeys="!text/more_keys_for_symbols_6" /> latin:additionalMoreKeys="*"
<Key latin:moreKeys="!text/more_keys_for_symbols_8" />
latin:keyLabel="7" <Key
latin:additionalMoreKeys="&amp;" latin:keyLabel="9"
latin:moreKeys="!text/more_keys_for_symbols_7" /> latin:additionalMoreKeys="("
<Key latin:moreKeys="!text/more_keys_for_symbols_9" />
latin:keyLabel="8" <Key
latin:additionalMoreKeys="*,%" latin:keyLabel="0"
latin:moreKeys="!text/more_keys_for_symbols_8" /> latin:additionalMoreKeys=")"
<Key latin:moreKeys="!text/more_keys_for_symbols_0" />
latin:keyLabel="9" <!-- U+2013: "–" EN DASH
latin:additionalMoreKeys="(" U+2014: "—" EM DASH
latin:moreKeys="!text/more_keys_for_symbols_9" /> U+00B7: "·" MIDDLE DOT -->
<Key <Key
latin:keyLabel="0" latin:keyLabel="-"
latin:additionalMoreKeys=")" latin:additionalMoreKeys="_"
latin:moreKeys="!text/more_keys_for_symbols_0" /> latin:moreKeys="&#x2013;,&#x2014;,&#x00B7;" />
<Key <!-- U+221E: "∞" INFINITY
latin:keyLabel="-" U+2260: "≠" NOT EQUAL TO
latin:moreKeys="_" /> U+2248: "≈" ALMOST EQUAL TO -->
<Key <Key
latin:keyLabel="=" latin:keyLabel="="
latin:moreKeys="+" /> latin:additionalMoreKeys="+"
</case> latin:moreKeys="!fixedColumnOrder!4,&#x221E;,&#x2260;,&#x2248;,%" />
<!-- keyboardLayoutSetElement="alphabet*Shifted|symbols" -->
<default>
<include
latin:keyboardLayout="@xml/keys_pcqwerty_symbols1" />
</default>
</switch>
</merge> </merge>

23
java/res/xml/keys_pcqwerty_symbols1.xml → java/res/xml/rowkeys_pcqwerty1_shift.xml
View File

@ -21,37 +21,40 @@
<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"
> >
<!-- U+00AC: "¬" NOT SIGN -->
<Key <Key
latin:keyLabel="~" latin:keyLabel="~" />
latin:moreKeys="&#x00AC;" />
<!-- U+00A1: "¡" NVERTED EXCLAMATION MARK -->
<Key <Key
latin:keyLabel="!" latin:keyLabel="!"
latin:moreKeys="&#x00A1;" /> latin:additionalMoreKeys="!text/more_keys_for_symbols_exclamation" />
<Key <Key
latin:keyLabel="\@" /> latin:keyLabel="\@" />
<Key <Key
latin:keyLabel="\#" /> latin:keyLabel="\#" />
<Key <Key
latin:keyLabel="$" /> latin:keyLabel="$"
<!-- U+2030: "‰" PER MILLE SIGN --> latin:additionalMoreKeys="!text/more_keys_for_currency_dollar" />
<Key <Key
latin:keyLabel="%" latin:keyLabel="%"
latin:moreKeys="&#x2030;" /> latin:additionalMoreKeys="!text/more_keys_for_symbols_percent" />
<Key <Key
latin:keyLabel="^" /> latin:keyLabel="^" />
<Key <Key
latin:keyLabel="&amp;" /> latin:keyLabel="&amp;" />
<Key <Key
latin:keyLabel="*" latin:keyLabel="*"
latin:moreKeys="!text/more_keys_for_star" /> latin:additionalMoreKeys="!text/more_keys_for_star" />
<Key <Key
latin:keyLabel="(" /> latin:keyLabel="(" />
<Key <Key
latin:keyLabel=")" /> latin:keyLabel=")" />
<Key <Key
latin:keyLabel="_" /> latin:keyLabel="_" />
<!-- U+00B1: "±" PLUS-MINUS SIGN
U+00D7: "×" MULTIPLICATION SIGN
U+00F7: "÷" DIVISION SIGN
U+221A: "√" SQUARE ROOT -->
<Key <Key
latin:keyLabel="+" /> latin:keyLabel="+"
latin:additionalMoreKeys="!text/more_keys_for_plus"
latin:moreKeys="&#x00B1;,&#x00D7;,&#x00F7;,&#x221A;" />
</merge> </merge>

20
java/res/xml/rowkeys_pcqwerty2.xml
View File

@ -21,21 +21,11 @@
<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> <!-- The keys on this PC layout row2 consist of the letters of QWERTY layout row1 and
<case some symbols keys. -->
latin:keyboardLayoutSetElement="symbols" <include
> latin:keyboardLayout="@xml/rowkeys_qwerty1"
<include latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
latin:keyboardLayout="@xml/keys_pcqwerty_symbols2" />
</case>
<default>
<!-- The keys on this PC layout row2 consist of the letters of QWERTY layout row1 and
some symbols keys. -->
<include
latin:keyboardLayout="@xml/rowkeys_qwerty1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
</default>
</switch>
<include <include
latin:keyboardLayout="@xml/keys_pcqwerty2_right3" /> latin:keyboardLayout="@xml/keys_pcqwerty2_right3" />
</merge> </merge>

18
java/res/xml/rowkeys_pcqwerty3.xml
View File

@ -21,20 +21,10 @@
<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> <!-- The keys on this PC layout row3 consist of the letters of QWERTY layout row2 and
<case some symbols keys. -->
latin:keyboardLayoutSetElement="symbols" <include
> latin:keyboardLayout="@xml/rowkeys_qwerty2" />
<include
latin:keyboardLayout="@xml/keys_pcqwerty_symbols3" />
</case>
<default>
<!-- The keys on this PC layout row3 consist of the letters of QWERTY layout row2 and
some symbols keys. -->
<include
latin:keyboardLayout="@xml/rowkeys_qwerty2" />
</default>
</switch>
<include <include
latin:keyboardLayout="@xml/keys_pcqwerty3_right2" /> latin:keyboardLayout="@xml/keys_pcqwerty3_right2" />
</merge> </merge>

18
java/res/xml/rowkeys_pcqwerty4.xml
View File

@ -21,20 +21,10 @@
<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> <!-- The keys on this PC layout row4 consist of the letters of QWERTY layout row3 and
<case some symbols keys. -->
latin:keyboardLayoutSetElement="symbols" <include
> latin:keyboardLayout="@xml/rowkeys_qwerty3" />
<include
latin:keyboardLayout="@xml/keys_pcqwerty_symbols4" />
</case>
<default>
<!-- The keys on this PC layout row4 consist of the letters of QWERTY layout row3 and
some symbols keys. -->
<include
latin:keyboardLayout="@xml/rowkeys_qwerty3" />
</default>
</switch>
<include <include
latin:keyboardLayout="@xml/keys_pcqwerty4_right3" /> latin:keyboardLayout="@xml/keys_pcqwerty4_right3" />
</merge> </merge>

15
java/res/xml/rows_pcqwerty.xml
View File

@ -26,8 +26,19 @@
<Row <Row
latin:keyWidth="7.692%p" latin:keyWidth="7.692%p"
> >
<include <switch>
latin:keyboardLayout="@xml/rowkeys_pcqwerty1" /> <case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" />
</default>
</switch>
</Row> </Row>
<Row <Row
latin:keyWidth="7.692%p" latin:keyWidth="7.692%p"

58
java/res/xml/rows_pcqwerty_symbols.xml
View File

@ -1,58 +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" />
<Row
latin:keyWidth="7.692%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
</Row>
<Row
latin:keyWidth="7.692%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty2" />
</Row>
<Row
latin:keyWidth="7.692%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty3"
latin:keyXPos="3.846%p" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"
latin:visualInsetsLeft="1%p" />
</Row>
<Row
latin:keyWidth="7.692%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty4"
latin:keyXPos="11.538%p" />
</Row>
<include
latin:keyboardLayout="@xml/row_pcqwerty5" />
</merge>

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

@ -231,25 +231,24 @@ public final class KeyboardTextsSet {
/* 126 */ "label_to_phone_symbols_key", /* 126 */ "label_to_phone_symbols_key",
/* 127 */ "label_time_am", /* 127 */ "label_time_am",
/* 128 */ "label_time_pm", /* 128 */ "label_time_pm",
/* 129 */ "label_to_symbol_key_pcqwerty", /* 129 */ "keylabel_for_popular_domain",
/* 130 */ "keylabel_for_popular_domain", /* 130 */ "more_keys_for_popular_domain",
/* 131 */ "more_keys_for_popular_domain", /* 131 */ "more_keys_for_smiley",
/* 132 */ "more_keys_for_smiley", /* 132 */ "single_laqm_raqm",
/* 133 */ "single_laqm_raqm", /* 133 */ "single_laqm_raqm_rtl",
/* 134 */ "single_laqm_raqm_rtl", /* 134 */ "single_raqm_laqm",
/* 135 */ "single_raqm_laqm", /* 135 */ "double_laqm_raqm",
/* 136 */ "double_laqm_raqm", /* 136 */ "double_laqm_raqm_rtl",
/* 137 */ "double_laqm_raqm_rtl", /* 137 */ "double_raqm_laqm",
/* 138 */ "double_raqm_laqm", /* 138 */ "single_lqm_rqm",
/* 139 */ "single_lqm_rqm", /* 139 */ "single_9qm_lqm",
/* 140 */ "single_9qm_lqm", /* 140 */ "single_9qm_rqm",
/* 141 */ "single_9qm_rqm", /* 141 */ "double_lqm_rqm",
/* 142 */ "double_lqm_rqm", /* 142 */ "double_9qm_lqm",
/* 143 */ "double_9qm_lqm", /* 143 */ "double_9qm_rqm",
/* 144 */ "double_9qm_rqm", /* 144 */ "more_keys_for_single_quote",
/* 145 */ "more_keys_for_single_quote", /* 145 */ "more_keys_for_double_quote",
/* 146 */ "more_keys_for_double_quote", /* 146 */ "more_keys_for_tablet_double_quote",
/* 147 */ "more_keys_for_tablet_double_quote",
}; };
private static final String EMPTY = ""; private static final String EMPTY = "";
@ -389,12 +388,10 @@ public final class KeyboardTextsSet {
/* 127 */ "AM", /* 127 */ "AM",
// Key label for "post meridiem" // Key label for "post meridiem"
/* 128 */ "PM", /* 128 */ "PM",
// Label for "switch to symbols" key on PC QWERTY layout /* 129 */ ".com",
/* 129 */ "Sym",
/* 130 */ ".com",
// popular web domains for the locale - most popular, displayed on the keyboard // popular web domains for the locale - most popular, displayed on the keyboard
/* 131 */ "!hasLabels!,.net,.org,.gov,.edu", /* 130 */ "!hasLabels!,.net,.org,.gov,.edu",
/* 132 */ "!fixedColumnOrder!5,!hasLabels!,=-O|=-O ,:-P|:-P ,;-)|;-) ,:-(|:-( ,:-)|:-) ,:-!|:-! ,:-$|:-$ ,B-)|B-) ,:O|:O ,:-*|:-* ,:-D|:-D ,:\'(|:\'( ,:-\\\\|:-\\\\ ,O:-)|O:-) ,:-[|:-[ ", /* 131 */ "!fixedColumnOrder!5,!hasLabels!,=-O|=-O ,:-P|:-P ,;-)|;-) ,:-(|:-( ,:-)|:-) ,:-!|:-! ,:-$|:-$ ,B-)|B-) ,:O|:O ,:-*|:-* ,:-D|:-D ,:\'(|:\'( ,:-\\\\|:-\\\\ ,O:-)|O:-) ,:-[|:-[ ",
// U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK // U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
// U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK // U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
// U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK // U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
@ -416,24 +413,24 @@ public final class KeyboardTextsSet {
// The following each quotation mark pair consist of // The following each quotation mark pair consist of
// <opening quotation mark>, <closing quotation mark> // <opening quotation mark>, <closing quotation mark>
// and is named after (single|double)_<opening quotation mark>_<closing quotation mark>. // and is named after (single|double)_<opening quotation mark>_<closing quotation mark>.
/* 133 */ "\u2039,\u203A", /* 132 */ "\u2039,\u203A",
/* 134 */ "\u2039|\u203A,\u203A|\u2039", /* 133 */ "\u2039|\u203A,\u203A|\u2039",
/* 135 */ "\u203A,\u2039", /* 134 */ "\u203A,\u2039",
/* 136 */ "\u00AB,\u00BB", /* 135 */ "\u00AB,\u00BB",
/* 137 */ "\u00AB|\u00BB,\u00BB|\u00AB", /* 136 */ "\u00AB|\u00BB,\u00BB|\u00AB",
/* 138 */ "\u00BB,\u00AB", /* 137 */ "\u00BB,\u00AB",
// The following each quotation mark triplet consists of // The following each quotation mark triplet consists of
// <another quotation mark>, <opening quotation mark>, <closing quotation mark> // <another quotation mark>, <opening quotation mark>, <closing quotation mark>
// and is named after (single|double)_<opening quotation mark>_<closing quotation mark>. // and is named after (single|double)_<opening quotation mark>_<closing quotation mark>.
/* 139 */ "\u201A,\u2018,\u2019", /* 138 */ "\u201A,\u2018,\u2019",
/* 140 */ "\u2019,\u201A,\u2018", /* 139 */ "\u2019,\u201A,\u2018",
/* 141 */ "\u2018,\u201A,\u2019", /* 140 */ "\u2018,\u201A,\u2019",
/* 142 */ "\u201E,\u201C,\u201D", /* 141 */ "\u201E,\u201C,\u201D",
/* 143 */ "\u201D,\u201E,\u201C", /* 142 */ "\u201D,\u201E,\u201C",
/* 144 */ "\u201C,\u201E,\u201D", /* 143 */ "\u201C,\u201E,\u201D",
/* 145 */ "!fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes", /* 144 */ "!fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes",
/* 146 */ "!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes", /* 145 */ "!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes",
/* 147 */ "!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes", /* 146 */ "!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes",
}; };
/* Language af: Afrikaans */ /* Language af: Afrikaans */

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

@ -197,8 +197,6 @@
<string name="label_time_am">"AM"</string> <string name="label_time_am">"AM"</string>
<!-- Key label for "post meridiem" --> <!-- Key label for "post meridiem" -->
<string name="label_time_pm">"PM"</string> <string name="label_time_pm">"PM"</string>
<!-- Label for "switch to symbols" key on PC QWERTY layout -->
<string name="label_to_symbol_key_pcqwerty">Sym</string>
<string name="keylabel_for_popular_domain">".com"</string> <string name="keylabel_for_popular_domain">".com"</string>
<!-- popular web domains for the locale - most popular, displayed on the keyboard --> <!-- popular web domains for the locale - most popular, displayed on the keyboard -->
<string name="more_keys_for_popular_domain">"!hasLabels!,.net,.org,.gov,.edu"</string> <string name="more_keys_for_popular_domain">"!hasLabels!,.net,.org,.gov,.edu"</string>