aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml/key_styles_common.xml
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-10-03 17:43:11 +0900
committerSatoshi Kataoka <satok@google.com>2013-10-04 11:21:51 +0900
commit5a54a5769c601260337cb9ad4a3ff1bc27f5b5f4 (patch)
treea658e9105a2c7250577ba08d02aa2a9907bc05a8 /java/res/xml/key_styles_common.xml
parent85607c59651ed2341265253d5ab7cd9f5326e7f1 (diff)
downloadlatinime-5a54a5769c601260337cb9ad4a3ff1bc27f5b5f4.tar.gz
latinime-5a54a5769c601260337cb9ad4a3ff1bc27f5b5f4.tar.xz
latinime-5a54a5769c601260337cb9ad4a3ff1bc27f5b5f4.zip
Revert emoji key position to JB-mr2
Bug: 10538430 Change-Id: Ie2033b2f5253b2e2fc2229ba6c95568e7b2a58fa
Diffstat (limited to 'java/res/xml/key_styles_common.xml')
-rw-r--r--java/res/xml/key_styles_common.xml21
1 files changed, 21 insertions, 0 deletions
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index 67ed9620d..c9d87bfd4 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -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"