am 0d43ce28: Merge "Fix keyboard layout"

* commit '0d43ce28c7ccf50ea8b8739409e357f4ec1e6020':
  Fix keyboard layout
main
Satoshi Kataoka 2013-10-17 01:41:00 -07:00 committed by Android Git Automerger
commit 28af0d5a1a
4 changed files with 8 additions and 4 deletions

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>

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>

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>

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>