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

Merge "Fix PC Qwerty shift locked layout"

main
Tadashi G. Takaoka 2014-03-20 09:39:42 +00:00 committed by Android (Google) Code Review
parent 437dbbcfee a49be9b112
commit a13096db38
10 changed files with 172 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@
> >
<switch> <switch>
<case <case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
> >
<Key <Key
latin:keySpec="[" latin:keySpec="["

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

@ -23,7 +23,7 @@
> >
<switch> <switch>
<case <case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
> >
<Key <Key
latin:keySpec=";" latin:keySpec=";"

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

@ -23,7 +23,7 @@
> >
<switch> <switch>
<case <case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
> >
<Key <Key
latin:keySpec="," latin:keySpec=","

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

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

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

@ -26,19 +26,8 @@
<Row <Row
latin:keyWidth="7.0%p" latin:keyWidth="7.0%p"
> >
<switch> <include
<case latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
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" />

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

@ -23,7 +23,7 @@
> >
<switch> <switch>
<case <case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
> >
<Key <Key
latin:keySpec="[" latin:keySpec="["

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

@ -23,7 +23,7 @@
> >
<switch> <switch>
<case <case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
> >
<Key <Key
latin:keySpec=";" latin:keySpec=";"

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

@ -23,7 +23,7 @@
> >
<switch> <switch>
<case <case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted" latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
> >
<Key <Key
latin:keySpec="," latin:keySpec=","

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

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

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

@ -26,19 +26,8 @@
<Row <Row
latin:keyWidth="7.692%p" latin:keyWidth="7.692%p"
> >
<switch> <include
<case latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
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"