diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-08-29 04:31:47 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-08-29 04:31:47 -0700 |
| commit | 243c23dd9f1c34e39fd257ffb99f7449c007c424 (patch) | |
| tree | d550c50d183117d6f1d57318a0c79d0a3f307383 /java/res/xml | |
| parent | 7c1a6f9787b4615f70656ddd6604d720be5b9d3e (diff) | |
| parent | d7791a93b0dee268a9e97f06fe5abcf6082e0ed1 (diff) | |
| download | latinime-243c23dd9f1c34e39fd257ffb99f7449c007c424.tar.gz latinime-243c23dd9f1c34e39fd257ffb99f7449c007c424.tar.xz latinime-243c23dd9f1c34e39fd257ffb99f7449c007c424.zip | |
am d7791a93: Support Emoji keyboard
* commit 'd7791a93b0dee268a9e97f06fe5abcf6082e0ed1':
Support Emoji keyboard
Diffstat (limited to 'java/res/xml')
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 27 | ||||
| -rw-r--r-- | java/res/xml/row_symbols4.xml | 2 |
2 files changed, 3 insertions, 26 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" diff --git a/java/res/xml/row_symbols4.xml b/java/res/xml/row_symbols4.xml index 5c15da6a5..bea139aba 100644 --- a/java/res/xml/row_symbols4.xml +++ b/java/res/xml/row_symbols4.xml @@ -50,7 +50,7 @@ latin:keyboardLayout="@xml/key_symbols_period" latin:backgroundType="functional" /> <Key - latin:keyStyle="enterKeyStyle" + latin:keyStyle="emojiKeyStyle" latin:keyWidth="fillRight" /> </Row> </merge> |