aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/dimens.xml2
-rw-r--r--java/res/values/donottranslate.xml2
-rw-r--r--java/res/xml/kbd_key_styles.xml21
-rw-r--r--java/res/xml/kbd_qwerty_row4.xml14
-rw-r--r--java/res/xml/kbd_symbols_row4.xml14
-rw-r--r--java/res/xml/kbd_symbols_shift_row4.xml14
6 files changed, 24 insertions, 43 deletions
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index ff0458cfe..a66caa7bd 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -57,7 +57,7 @@
<dimen name="mini_keyboard_vertical_correction">-0.330in</dimen>
<!-- We use "inch", not "dip" because this value tries dealing with physical distance related
to user's finger. -->
- <dimen name="keyboard_vertical_correction">-0.05in</dimen>
+ <dimen name="keyboard_vertical_correction">0.0in</dimen>
<fraction name="key_letter_ratio">55%</fraction>
<fraction name="key_large_letter_ratio">65%</fraction>
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index a70c795e2..b6adf6342 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -41,7 +41,7 @@
<!-- Label for "switch to phone numeric" key. Must be short to fit on key! -->
<string name="label_to_phone_numeric_key">123</string>
<!-- Label for "switch to phone symbols" key. Must be short to fit on key! -->
- <string name="label_to_phone_symbols_key">\uff0a\uff03\uff08</string>
+ <string name="label_to_phone_symbols_key">\uff0a\uff03</string>
<!-- Character for candidate divider (BOX DRAWINGS LIGHT VERTICAL) -->
<string name="label_candidate_divider">\u2502</string>
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" />