Merge "Shift + smiley key become return key"

This commit is contained in:
Tadashi G. Takaoka 2012-02-02 21:46:50 -08:00 committed by Android (Google) Code Review
commit 98aa476131

View file

@ -99,11 +99,26 @@
latin:keyActionFlags="isRepeatable|noKeyPreview" latin:keyActionFlags="isRepeatable|noKeyPreview"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<!-- Return key style --> <!-- Return key style -->
<key-style
latin:styleName="defaultReturnKeyStyle"
latin:code="@integer/key_return"
latin:keyIcon="iconReturnKey"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<switch> <switch>
<case <case
latin:mode="im" latin:mode="im"
> >
<!-- Smiley key. --> <!-- Smiley key. -->
<switch>
<case
latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted"
>
<key-style
latin:styleName="returnKeyStyle"
latin:parentStyle="defaultReturnKeyStyle" />
</case>
<default>
<key-style <key-style
latin:styleName="returnKeyStyle" latin:styleName="returnKeyStyle"
latin:keyLabel=":-)" latin:keyLabel=":-)"
@ -112,6 +127,8 @@
latin:moreKeys="@string/more_keys_for_smiley" latin:moreKeys="@string/more_keys_for_smiley"
latin:maxMoreKeysColumn="5" latin:maxMoreKeysColumn="5"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
</default>
</switch>
</case> </case>
<case <case
latin:imeAction="actionGo" latin:imeAction="actionGo"
@ -171,10 +188,7 @@
<default> <default>
<key-style <key-style
latin:styleName="returnKeyStyle" latin:styleName="returnKeyStyle"
latin:code="@integer/key_return" latin:parentStyle="defaultReturnKeyStyle" />
latin:keyIcon="iconReturnKey"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
</default> </default>
</switch> </switch>
<key-style <key-style