diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-08-30 10:28:01 +0000 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2013-08-30 19:46:10 +0900 |
| commit | 5169937dd48d69e52e647662cb6fc3def5bf90d4 (patch) | |
| tree | 06d8994729aca4e4bf53b69c8a83868ee9331557 /java/res/xml/key_styles_common.xml | |
| parent | 9f79cf6de4eac149ffb496bea34b9d091bed7bc4 (diff) | |
| download | latinime-5169937dd48d69e52e647662cb6fc3def5bf90d4.tar.gz latinime-5169937dd48d69e52e647662cb6fc3def5bf90d4.tar.xz latinime-5169937dd48d69e52e647662cb6fc3def5bf90d4.zip | |
Revert "Revert "Support Emoji keyboard""
Window resizing junkiness is addressed in I605e657c9468
This reverts commit aabc97233826da69edbadfc7c1465a505a1fe2ec.
Change-Id: I0bc0f1ad9a90799e643fe9ec35f5b4bbe94eee0d
Diffstat (limited to 'java/res/xml/key_styles_common.xml')
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index dabe1e7eb..c1c2c3e06 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -67,30 +67,6 @@ 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" @@ -129,7 +105,8 @@ latin:styleName="emojiKeyStyle" latin:code="!code/key_emoji" latin:keyIcon="!icon/emoji_key" - latin:keyActionFlags="noKeyPreview" /> + latin:keyActionFlags="noKeyPreview" + latin:backgroundType="functional" /> <key-style latin:styleName="tabKeyStyle" latin:code="!code/key_tab" |