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

am b4b0a050: am 2e7f360a: Merge "Do not merge. Fix keyboard layout" into klp-dev

Browse source 
* commit 'b4b0a0507a3bde504623611bec31b110086ab416':
  Do not merge. Fix keyboard layout
This commit is contained in:
Satoshi Kataoka 2013-10-17 17:47:26 -07:00 committed by Android Git Automerger
commit 0f5031ea34
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,5 +70,7 @@
latin:keyWidth="10%p" />
<include
latin:keyboardLayout="@xml/row_symbols_shift4" />
<include
latin:keyboardLayout="@xml/key_f2" />
</Row>
</merge>

3
java/res/xml/key_styles_enter.xml
View file

@ -190,6 +190,7 @@
>
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="!text/emoji_key_as_more_key" />
</case>
<case
@ -207,6 +208,7 @@
>
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="!text/emoji_key_as_more_key" />
</case>
<case
@ -242,6 +244,7 @@
>
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="!text/emoji_key_as_more_key" />
</case>
<default>

4
java/res/xml/row_symbols_shift4.xml
View file

@ -23,8 +23,4 @@
<include
latin:keyboardLayout="@xml/key_space_symbols" />
<include latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_f2" />
</merge>

3
java/res/xml/rows_symbols_shift.xml
View file

@ -60,5 +60,8 @@
latin:keyWidth="15%p" />
<include
latin:keyboardLayout="@xml/row_symbols_shift4" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
</merge>