nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 98aa4761: Merge "Shift + smiley key become return key" 

* commit '98aa47613149ad9c56f8e01ae1669bb9a34fdbd4':
  Shift + smiley key become return key
main
Tadashi G. Takaoka 2012-02-02 21:48:39 -08:00 committed by Android Git Automerger
parent 7876326bf1 98aa476131
commit a402c395ad
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
java/res/xml/key_styles_common.xml
View File

@ -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