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

Fix PC Qwerty layout

Browse source 
This CL fixes:
 - Action label never displayed on phone.
 - Go action label incorrectly showed on tablet.
 - Broken layout on noMicrophoneKey+noSettingsKey input field.
 - "Voice input key" settings has no effect on phone.
 - Inconsistent microphone and emoji key layouts.
 - Slightly modified spacebar size when language switch key is on.
 - Slightly larger enter key on tablet.

Bug: 13537661
Change-Id: I69a6ee7bc99e84b104a4d0352e1824096f6a4750
This commit is contained in:
Tadashi G. Takaoka 2014-03-19 17:26:17 +09:00
parent 0dabae720a
commit bdd79917f0
4 changed files with 29 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
java/res/xml-sw600dp/key_styles_enter.xml
View file

@ -112,7 +112,7 @@
>
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="!text/label_go_key|!code/key_shift_enter"
latin:keySpec="!icon/enter_key|!code/key_shift_enter"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case

39
java/res/xml-sw600dp/row_pcqwerty5.xml
View file

@ -24,37 +24,32 @@
<Row
latin:keyWidth="7.0%p"
>
<include
latin:keyWidth="9.0%p"
latin:keyboardLayout="@xml/key_shortcut" />
<switch>
<case
latin:languageSwitchKeyEnabled="true"
>
<Key
latin:keyStyle="languageSwitchKeyStyle"
latin:keyWidth="9.0%p"
latin:backgroundType="functional" />
latin:keyXPos="22.0%p"
latin:keyWidth="9.0%p" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="40.0%p" />
</case>
</switch>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="25.5%p"
latin:keyWidth="49.0%p" />
<switch>
<case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
>
<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_f2" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="29.0%p"
latin:keyWidth="42.0%p" />
</default>
</switch>
<include
latin:keyXPos="-9.0%p"
latin:keyWidth="9.0%p"
latin:backgroundType="functional"
latin:keyboardLayout="@xml/key_f2" />
</Row>
</merge>

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

@ -56,7 +56,7 @@
latin:keyWidth="7.0%p"
>
<Spacer
latin:keyWidth="12.0%p" />
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty3" />
<Key

23
java/res/xml/row_pcqwerty5.xml
View file

@ -24,23 +24,21 @@
<Row
latin:keyWidth="7.692%p"
>
<Spacer
latin:keyWidth="11.538%p" />
<switch>
<case
latin:supportsSwitchingToShortcutIme="true"
latin:hasShortcutKey="true"
>
<Key
latin:keyStyle="shortcutKeyStyle"
latin:keyWidth="11.538%p" />
</case>
</case>
<case
latin:clobberSettingsKey="false"
>
<Key
latin:keyStyle="settingsKeyStyle"
latin:keyWidth="11.538%p" />
</case>
</case>
</switch>
<switch>
<case
@ -48,24 +46,23 @@
>
<Key
latin:keyStyle="languageSwitchKeyStyle"
latin:keyXPos="19.231%p"
latin:keyWidth="11.538%p" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="38.464%p" />
</case>
latin:keyWidth="42.308%p" />
</case>
<!-- languageSwitchKeyEnabled="false" -->
<default>
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="50.002%p" />
latin:keyXPos="26.923%p"
latin:keyWidth="46.154%p" />
</default>
</switch>
<Key
latin:keyStyle="defaultEnterKeyStyle"
latin:keySpec="!icon/enter_key|!code/key_enter"
latin:keyWidth="15.384%p" />
<Key
latin:keyStyle="emojiKeyStyle"
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-19.231%p"
latin:keyWidth="fillRight" />
</Row>
</merge>