Do not merge. Revert emoji key position to JB-mr2
Cherry pick of Ie2033b2f5253b2e2 Bug: 10954182 Change-Id: I9cc61e27a207055d5a43fe3da6fd1ec63bae49fdmain
parent
3cc0a1d2e0
commit
2215ce5811
|
@ -68,5 +68,7 @@
|
|||
latin:keyWidth="10.0%p" />
|
||||
<include
|
||||
latin:keyboardLayout="@xml/row_symbols4" />
|
||||
<include
|
||||
latin:keyboardLayout="@xml/key_f2" />
|
||||
</Row>
|
||||
</merge>
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -60,5 +60,8 @@
|
|||
latin:keyWidth="15%p" />
|
||||
<include
|
||||
latin:keyboardLayout="@xml/row_symbols4" />
|
||||
<Key
|
||||
latin:keyStyle="enterKeyStyle"
|
||||
latin:keyWidth="fillRight" />
|
||||
</Row>
|
||||
</merge>
|
||||
|
|
Loading…
Reference in New Issue