am f4aa9a7b: Do not merge. Revert emoji key position to JB-mr2

* commit 'f4aa9a7bd71b646cee8dd7dd19af27bc56238d1e':
  Do not merge. Revert emoji key position to JB-mr2
main
Satoshi Kataoka 2013-10-04 00:47:41 -07:00 committed by Android Git Automerger
commit d03f17936b
4 changed files with 26 additions and 4 deletions

View File

@ -68,5 +68,7 @@
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/row_symbols4" />
<include
latin:keyboardLayout="@xml/key_f2" />
</Row>
</merge>

View File

@ -121,6 +121,27 @@
latin:keyIcon="!icon/emoji_key"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<!-- Overriding EnterKeyStyle here -->
<switch>
<!-- Shift + Enter in textMultiLine field. -->
<case
latin:isMultiLine="true"
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
>
<key-style
latin:styleName="enterKeyStyle"
latin:parentStyle="shiftEnterKeyStyle" />
</case>
<!-- Smiley in textShortMessage field.
Overrides common enter key style. -->
<case
latin:mode="im"
>
<key-style
latin:styleName="enterKeyStyle"
latin:parentStyle="emojiKeyStyle" />
</case>
</switch>
<key-style
latin:styleName="tabKeyStyle"
latin:code="!code/key_tab"

View File

@ -39,8 +39,4 @@
<include latin:keyboardLayout="@xml/key_space_symbols" />
<include latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="emojiKeyStyle"
latin:keyWidth="fillRight" />
</merge>

View File

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