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

am a13096db: Merge "Fix PC Qwerty shift locked layout"

Browse source 
* commit 'a13096db38528289043892e574b319b5463872cd':
  Fix PC Qwerty shift locked layout
This commit is contained in:
Tadashi G. Takaoka 2014-03-20 02:42:22 -07:00 committed by Android Git Automerger
commit 3f241c3386
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=","

11
java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
View file

@ -20,6 +20,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>
<case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
> >
<Key <Key
latin:keySpec="`" latin:keySpec="`"
@ -104,4 +108,11 @@
latin:additionalMoreKeys="+" latin:additionalMoreKeys="+"
latin:keyStyle="hasShiftedLetterHintStyle" latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="&#x221E;,&#x2260;,&#x2248;" /> latin:moreKeys="&#x221E;,&#x2260;,&#x2248;" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" -->
<default>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" />
</default>
</switch>
</merge> </merge>

11
java/res/xml-sw600dp/rows_pcqwerty.xml
View file

@ -25,20 +25,9 @@
latin:keyboardLayout="@xml/key_styles_common" /> latin:keyboardLayout="@xml/key_styles_common" />
<Row <Row
latin:keyWidth="7.0%p" latin:keyWidth="7.0%p"
>
<switch>
<case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1" /> 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=","

11
java/res/xml/rowkeys_pcqwerty1.xml
View file

@ -20,6 +20,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>
<case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
> >
<Key <Key
latin:keySpec="`" latin:keySpec="`"
@ -78,4 +82,11 @@
latin:keySpec="=" latin:keySpec="="
latin:additionalMoreKeys="+" latin:additionalMoreKeys="+"
latin:moreKeys="!fixedColumnOrder!4,&#x221E;,&#x2260;,&#x2248;,%" /> latin:moreKeys="!fixedColumnOrder!4,&#x221E;,&#x2260;,&#x2248;,%" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" -->
<default>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" />
</default>
</switch>
</merge> </merge>

11
java/res/xml/rows_pcqwerty.xml
View file

@ -25,20 +25,9 @@
latin:keyboardLayout="@xml/key_styles_common" /> latin:keyboardLayout="@xml/key_styles_common" />
<Row <Row
latin:keyWidth="7.692%p" latin:keyWidth="7.692%p"
>
<switch>
<case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1" /> 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"