diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-08-30 07:23:42 +0000 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2013-08-30 07:23:42 +0000 |
| commit | aabc97233826da69edbadfc7c1465a505a1fe2ec (patch) | |
| tree | 574863d0acfbb617427ae4a4030a68fdec82ca0c /java/res/xml/key_styles_common.xml | |
| parent | d7791a93b0dee268a9e97f06fe5abcf6082e0ed1 (diff) | |
| download | latinime-aabc97233826da69edbadfc7c1465a505a1fe2ec.tar.gz latinime-aabc97233826da69edbadfc7c1465a505a1fe2ec.tar.xz latinime-aabc97233826da69edbadfc7c1465a505a1fe2ec.zip | |
Revert "Support Emoji keyboard"
This reverts commit d7791a93b0dee268a9e97f06fe5abcf6082e0ed1.
Change-Id: I5ca4c0227f97540e8a22b487b5056dfa3611082b
Diffstat (limited to 'java/res/xml/key_styles_common.xml')
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index c1c2c3e06..dabe1e7eb 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -67,6 +67,30 @@ latin:backgroundType="functional" /> <include latin:keyboardLayout="@xml/key_styles_enter" /> + <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:keyLabel=":-)" + latin:keyOutputText=":-) " + latin:keyLabelFlags="hasPopupHint" + latin:moreKeys="!text/more_keys_for_smiley" + latin:backgroundType="functional" /> + </case> + </switch> <key-style latin:styleName="spaceKeyStyle" latin:code="!code/key_space" @@ -105,8 +129,7 @@ latin:styleName="emojiKeyStyle" latin:code="!code/key_emoji" latin:keyIcon="!icon/emoji_key" - latin:keyActionFlags="noKeyPreview" - latin:backgroundType="functional" /> + latin:keyActionFlags="noKeyPreview" /> <key-style latin:styleName="tabKeyStyle" latin:code="!code/key_tab" |