diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-02-02 21:48:39 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-02-02 21:48:39 -0800 |
| commit | a402c395ada0a6582aa13a513464866057de5eca (patch) | |
| tree | c1ff138f2c9034ceeee92aa13a0ad716821315cd /java | |
| parent | 7876326bf1140b6f97df5550e954a5e6cfc5ee7e (diff) | |
| parent | 98aa47613149ad9c56f8e01ae1669bb9a34fdbd4 (diff) | |
| download | latinime-a402c395ada0a6582aa13a513464866057de5eca.tar.gz latinime-a402c395ada0a6582aa13a513464866057de5eca.tar.xz latinime-a402c395ada0a6582aa13a513464866057de5eca.zip | |
am 98aa4761: Merge "Shift + smiley key become return key"
* commit '98aa47613149ad9c56f8e01ae1669bb9a34fdbd4':
Shift + smiley key become return key
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index 14ee19ee9..ab9bc4672 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -99,19 +99,36 @@ latin:keyActionFlags="isRepeatable|noKeyPreview" latin:backgroundType="functional" /> <!-- Return key style --> + <key-style + latin:styleName="defaultReturnKeyStyle" + latin:code="@integer/key_return" + latin:keyIcon="iconReturnKey" + latin:keyActionFlags="noKeyPreview" + latin:backgroundType="functional" /> <switch> <case latin:mode="im" > <!-- Smiley key. --> - <key-style - latin:styleName="returnKeyStyle" - latin:keyLabel=":-)" - latin:keyOutputText=":-) " - latin:keyLabelFlags="hasPopupHint|preserveCase" - latin:moreKeys="@string/more_keys_for_smiley" - latin:maxMoreKeysColumn="5" - latin:backgroundType="functional" /> + <switch> + <case + latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted" + > + <key-style + latin:styleName="returnKeyStyle" + latin:parentStyle="defaultReturnKeyStyle" /> + </case> + <default> + <key-style + latin:styleName="returnKeyStyle" + latin:keyLabel=":-)" + latin:keyOutputText=":-) " + latin:keyLabelFlags="hasPopupHint|preserveCase" + latin:moreKeys="@string/more_keys_for_smiley" + latin:maxMoreKeysColumn="5" + latin:backgroundType="functional" /> + </default> + </switch> </case> <case latin:imeAction="actionGo" @@ -171,10 +188,7 @@ <default> <key-style latin:styleName="returnKeyStyle" - latin:code="@integer/key_return" - latin:keyIcon="iconReturnKey" - latin:keyActionFlags="noKeyPreview" - latin:backgroundType="functional" /> + latin:parentStyle="defaultReturnKeyStyle" /> </default> </switch> <key-style |