diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-10-04 00:47:41 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-04 00:47:41 -0700 |
| commit | d03f17936b95be7da38c36a65cfc4e62176ef7ed (patch) | |
| tree | 55968f74ad4cfac74ce1dcea59ebf42aeb5d6bb6 /java | |
| parent | b04ad22c3b3d9b775f3677cd49ae6f2719a294c3 (diff) | |
| parent | f4aa9a7bd71b646cee8dd7dd19af27bc56238d1e (diff) | |
| download | latinime-d03f17936b95be7da38c36a65cfc4e62176ef7ed.tar.gz latinime-d03f17936b95be7da38c36a65cfc4e62176ef7ed.tar.xz latinime-d03f17936b95be7da38c36a65cfc4e62176ef7ed.zip | |
am f4aa9a7b: Do not merge. Revert emoji key position to JB-mr2
* commit 'f4aa9a7bd71b646cee8dd7dd19af27bc56238d1e':
Do not merge. Revert emoji key position to JB-mr2
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml-sw600dp/rows_symbols.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 21 | ||||
| -rw-r--r-- | java/res/xml/row_symbols4.xml | 4 | ||||
| -rw-r--r-- | java/res/xml/rows_symbols.xml | 3 |
4 files changed, 26 insertions, 4 deletions
diff --git a/java/res/xml-sw600dp/rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml index fbd8492cd..cf94b06ed 100644 --- a/java/res/xml-sw600dp/rows_symbols.xml +++ b/java/res/xml-sw600dp/rows_symbols.xml @@ -68,5 +68,7 @@ latin:keyWidth="10.0%p" /> <include latin:keyboardLayout="@xml/row_symbols4" /> + <include + latin:keyboardLayout="@xml/key_f2" /> </Row> </merge> 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" diff --git a/java/res/xml/row_symbols4.xml b/java/res/xml/row_symbols4.xml index 0bf412fff..fbfdc5f72 100644 --- a/java/res/xml/row_symbols4.xml +++ b/java/res/xml/row_symbols4.xml @@ -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> diff --git a/java/res/xml/rows_symbols.xml b/java/res/xml/rows_symbols.xml index 3f102e277..d0606c63b 100644 --- a/java/res/xml/rows_symbols.xml +++ b/java/res/xml/rows_symbols.xml @@ -60,5 +60,8 @@ latin:keyWidth="15%p" /> <include latin:keyboardLayout="@xml/row_symbols4" /> + <Key + latin:keyStyle="enterKeyStyle" + latin:keyWidth="fillRight" /> </Row> </merge> |