diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-07-31 20:06:39 -0700 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2011-07-31 20:06:39 -0700 |
| commit | 48dda9e0282d1464957356d94cb804a7b30187a9 (patch) | |
| tree | 7a299ebc6fd619fb56a88c221679c2820d997536 /java | |
| parent | e00d44d0c8a1420482121f2f3347def9ef430778 (diff) | |
| download | latinime-48dda9e0282d1464957356d94cb804a7b30187a9.tar.gz latinime-48dda9e0282d1464957356d94cb804a7b30187a9.tar.xz latinime-48dda9e0282d1464957356d94cb804a7b30187a9.zip | |
Merge smiley key style into return key style for phone
Bug: 4340933
Change-Id: If2b586e5fade1610489e4a53cddafb89834bba07
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml/kbd_key_styles.xml | 21 | ||||
| -rw-r--r-- | java/res/xml/kbd_qwerty_row4.xml | 14 | ||||
| -rw-r--r-- | java/res/xml/kbd_symbols_row4.xml | 14 | ||||
| -rw-r--r-- | java/res/xml/kbd_symbols_shift_row4.xml | 14 |
4 files changed, 22 insertions, 41 deletions
diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml index 221c1e380..5c4bf52b4 100644 --- a/java/res/xml/kbd_key_styles.xml +++ b/java/res/xml/kbd_key_styles.xml @@ -82,6 +82,19 @@ <!-- 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" > <key-style @@ -139,14 +152,6 @@ 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" latin:keyIcon="iconShortcutKey" diff --git a/java/res/xml/kbd_qwerty_row4.xml b/java/res/xml/kbd_qwerty_row4.xml index 739cbc012..eb1e9b8b3 100644 --- a/java/res/xml/kbd_qwerty_row4.xml +++ b/java/res/xml/kbd_qwerty_row4.xml @@ -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" /> diff --git a/java/res/xml/kbd_symbols_row4.xml b/java/res/xml/kbd_symbols_row4.xml index 534d18307..864cf2b8e 100644 --- a/java/res/xml/kbd_symbols_row4.xml +++ b/java/res/xml/kbd_symbols_row4.xml @@ -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" /> diff --git a/java/res/xml/kbd_symbols_shift_row4.xml b/java/res/xml/kbd_symbols_shift_row4.xml index 11c2b00a7..9cb453fbc 100644 --- a/java/res/xml/kbd_symbols_shift_row4.xml +++ b/java/res/xml/kbd_symbols_shift_row4.xml @@ -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" /> |