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

Merge smiley key style into return key style for phone

Browse source 
Bug: 4340933
Change-Id: If2b586e5fade1610489e4a53cddafb89834bba07
This commit is contained in:
Tadashi G. Takaoka 2011-07-31 20:06:39 -07:00
parent e00d44d0c8
commit 48dda9e028
4 changed files with 22 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
java/res/xml/kbd_key_styles.xml
View file

@ -81,6 +81,19 @@
latin:isRepeatable="true" />
<!-- Return key style -->
<switch>
<case
latin:mode="im"
>
<!-- Smiley key. -->
<key-style
latin:styleName="returnKeyStyle"
latin:keyLabel=":-)"
latin:keyOutputText=":-) "
latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="@string/alternates_for_smiley"
latin:maxPopupKeyboardColumn="5"
latin:parentStyle="functionalKeyStyle" />
</case>
<case
latin:imeAction="actionGo"
>
@ -138,14 +151,6 @@
latin:styleName="spaceKeyStyle"
latin:code="@integer/key_space"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="smileyKeyStyle"
latin:keyLabel=":-)"
latin:keyOutputText=":-) "
latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="@string/alternates_for_smiley"
latin:maxPopupKeyboardColumn="5"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="shortcutKeyStyle"
latin:code="@integer/key_shortcut"

14
java/res/xml/kbd_qwerty_row4.xml
View file

@ -39,6 +39,9 @@
latin:keyWidth="50%p" />
<Key
latin:keyStyle="punctuationKeyStyle" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="fillRight" />
</case>
<!-- hasSettingsKey="true" or navigateAction="true" -->
<default>
@ -55,17 +58,6 @@
<Key
latin:keyStyle="punctuationKeyStyle"
latin:keyWidth="9.2%p" />
</default>
</switch>
<switch>
<case
latin:mode="im"
>
<Key
latin:keyStyle="smileyKeyStyle"
latin:keyWidth="fillRight" />
</case>
<default>
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="fillRight" />

14
java/res/xml/kbd_symbols_row4.xml
View file

@ -39,6 +39,9 @@
latin:keyWidth="50%p" />
<Key
latin:keyStyle="punctuationKeyStyle" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="fillRight" />
</case>
<!-- hasSettingsKey="true" or navigateAction="true" -->
<default>
@ -55,17 +58,6 @@
<Key
latin:keyStyle="punctuationKeyStyle"
latin:keyWidth="9.2%p" />
</default>
</switch>
<switch>
<case
latin:mode="im"
>
<Key
latin:keyStyle="smileyKeyStyle"
latin:keyWidth="fillRight" />
</case>
<default>
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="fillRight" />

14
java/res/xml/kbd_symbols_shift_row4.xml
View file

@ -42,6 +42,9 @@
<Key
latin:keyLabel="…"
latin:keyStyle="nonPasswordFunctionalKeyStyle" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="fillRight" />
</case>
<!-- hasSettingsKey="true" or navigateAction="true" -->
<default>
@ -62,17 +65,6 @@
latin:keyLabel="…"
latin:keyWidth="9.2%p"
latin:keyStyle="nonPasswordFunctionalKeyStyle" />
</default>
</switch>
<switch>
<case
latin:mode="im"
>
<Key
latin:keyStyle="smileyKeyStyle"
latin:keyWidth="fillRight" />
</case>
<default>
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="fillRight" />