diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-03-19 17:26:17 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2014-03-19 19:37:27 +0900 |
| commit | bdd79917f0b229d92551a7ada15ef1bd7beaeb95 (patch) | |
| tree | 107ac9e520f999cf97e6af25ad5190d78bdb4284 /java/res/xml-sw600dp | |
| parent | 0dabae720a83f9099667dea4de002007fdf35d60 (diff) | |
| download | latinime-bdd79917f0b229d92551a7ada15ef1bd7beaeb95.tar.gz latinime-bdd79917f0b229d92551a7ada15ef1bd7beaeb95.tar.xz latinime-bdd79917f0b229d92551a7ada15ef1bd7beaeb95.zip | |
Fix PC Qwerty layout
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
Diffstat (limited to 'java/res/xml-sw600dp')
| -rw-r--r-- | java/res/xml-sw600dp/key_styles_enter.xml | 2 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/row_pcqwerty5.xml | 39 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rows_pcqwerty.xml | 2 |
3 files changed, 19 insertions, 24 deletions
diff --git a/java/res/xml-sw600dp/key_styles_enter.xml b/java/res/xml-sw600dp/key_styles_enter.xml index 38a38fd45..05762ad14 100644 --- a/java/res/xml-sw600dp/key_styles_enter.xml +++ b/java/res/xml-sw600dp/key_styles_enter.xml @@ -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 diff --git a/java/res/xml-sw600dp/row_pcqwerty5.xml b/java/res/xml-sw600dp/row_pcqwerty5.xml index b854f1051..52b581ae6 100644 --- a/java/res/xml-sw600dp/row_pcqwerty5.xml +++ b/java/res/xml-sw600dp/row_pcqwerty5.xml @@ -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" /> - </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" /> + latin:keyXPos="22.0%p" + latin:keyWidth="9.0%p" /> + <Key + latin:keyStyle="spaceKeyStyle" + latin:keyWidth="40.0%p" /> </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> diff --git a/java/res/xml-sw600dp/rows_pcqwerty.xml b/java/res/xml-sw600dp/rows_pcqwerty.xml index 8714815ef..b503d839d 100644 --- a/java/res/xml-sw600dp/rows_pcqwerty.xml +++ b/java/res/xml-sw600dp/rows_pcqwerty.xml @@ -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 |