diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/drawable-hdpi/sym_keyboard_settings_holo_dark.png | bin | 889 -> 787 bytes | |||
| -rw-r--r-- | java/res/drawable-mdpi/sym_keyboard_settings_holo_dark.png | bin | 708 -> 585 bytes | |||
| -rw-r--r-- | java/res/drawable-xhdpi/sym_keyboard_settings_holo_dark.png | bin | 1309 -> 1062 bytes | |||
| -rw-r--r-- | java/res/drawable-xxhdpi/sym_keyboard_settings_holo_dark.png | bin | 1471 -> 1455 bytes | |||
| -rw-r--r-- | java/res/values-sw600dp-land/dimens.xml | 2 | ||||
| -rw-r--r-- | java/res/values-sw600dp/dimens.xml | 2 | ||||
| -rw-r--r-- | java/res/values-sw768dp-land/dimens.xml | 2 | ||||
| -rw-r--r-- | java/res/values-sw768dp/dimens.xml | 2 | ||||
| -rw-r--r-- | java/res/values-v19/emoji-categories.xml | 2 | ||||
| -rw-r--r-- | java/res/values/config.xml | 2 | ||||
| -rw-r--r-- | java/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rows_symbols.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 21 | ||||
| -rw-r--r-- | java/res/xml/row_symbols4.xml | 4 | ||||
| -rw-r--r-- | java/res/xml/rows_symbols.xml | 3 |
15 files changed, 33 insertions, 11 deletions
diff --git a/java/res/drawable-hdpi/sym_keyboard_settings_holo_dark.png b/java/res/drawable-hdpi/sym_keyboard_settings_holo_dark.png Binary files differindex c76008ab3..5af09ad8c 100644 --- a/java/res/drawable-hdpi/sym_keyboard_settings_holo_dark.png +++ b/java/res/drawable-hdpi/sym_keyboard_settings_holo_dark.png diff --git a/java/res/drawable-mdpi/sym_keyboard_settings_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_settings_holo_dark.png Binary files differindex a76a976c5..36c8c9623 100644 --- a/java/res/drawable-mdpi/sym_keyboard_settings_holo_dark.png +++ b/java/res/drawable-mdpi/sym_keyboard_settings_holo_dark.png diff --git a/java/res/drawable-xhdpi/sym_keyboard_settings_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_settings_holo_dark.png Binary files differindex 05eaffe2e..99ee97dbf 100644 --- a/java/res/drawable-xhdpi/sym_keyboard_settings_holo_dark.png +++ b/java/res/drawable-xhdpi/sym_keyboard_settings_holo_dark.png diff --git a/java/res/drawable-xxhdpi/sym_keyboard_settings_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_settings_holo_dark.png Binary files differindex e4358463b..7041bb6ce 100644 --- a/java/res/drawable-xxhdpi/sym_keyboard_settings_holo_dark.png +++ b/java/res/drawable-xxhdpi/sym_keyboard_settings_holo_dark.png diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml index d067265e3..d79e8ca35 100644 --- a/java/res/values-sw600dp-land/dimens.xml +++ b/java/res/values-sw600dp-land/dimens.xml @@ -66,7 +66,7 @@ <!-- Emoji keyboard --> <fraction name="emoji_keyboard_key_width">10%p</fraction> <fraction name="emoji_keyboard_row_height">33%p</fraction> - <fraction name="emoji_keyboard_key_letter_size">85%p</fraction> + <fraction name="emoji_keyboard_key_letter_size">70%p</fraction> <integer name="emoji_keyboard_max_key_count">30</integer> </resources> diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml index 591355d3c..b2f4ae043 100644 --- a/java/res/values-sw600dp/dimens.xml +++ b/java/res/values-sw600dp/dimens.xml @@ -92,7 +92,7 @@ <!-- Emoji keyboard --> <fraction name="emoji_keyboard_key_width">12.5%p</fraction> <fraction name="emoji_keyboard_row_height">33%p</fraction> - <fraction name="emoji_keyboard_key_letter_size">76%p</fraction> + <fraction name="emoji_keyboard_key_letter_size">60%p</fraction> <integer name="emoji_keyboard_max_key_count">24</integer> </resources> diff --git a/java/res/values-sw768dp-land/dimens.xml b/java/res/values-sw768dp-land/dimens.xml index 664630b4f..ce315b0fc 100644 --- a/java/res/values-sw768dp-land/dimens.xml +++ b/java/res/values-sw768dp-land/dimens.xml @@ -67,7 +67,7 @@ <!-- Emoji keyboard --> <fraction name="emoji_keyboard_key_width">7.69%p</fraction> <fraction name="emoji_keyboard_row_height">33%p</fraction> - <fraction name="emoji_keyboard_key_letter_size">68%p</fraction> + <fraction name="emoji_keyboard_key_letter_size">60%p</fraction> <integer name="emoji_keyboard_max_key_count">39</integer> </resources> diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml index 1fd933abf..c90da7fed 100644 --- a/java/res/values-sw768dp/dimens.xml +++ b/java/res/values-sw768dp/dimens.xml @@ -92,7 +92,7 @@ <!-- Emoji keyboard --> <fraction name="emoji_keyboard_key_width">10%p</fraction> <fraction name="emoji_keyboard_row_height">33%p</fraction> - <fraction name="emoji_keyboard_key_letter_size">76%p</fraction> + <fraction name="emoji_keyboard_key_letter_size">68%p</fraction> <integer name="emoji_keyboard_max_key_count">30</integer> </resources> diff --git a/java/res/values-v19/emoji-categories.xml b/java/res/values-v19/emoji-categories.xml index 0d5aa1aa1..51aad6ede 100644 --- a/java/res/values-v19/emoji-categories.xml +++ b/java/res/values-v19/emoji-categories.xml @@ -214,7 +214,7 @@ <item>fe835|0038,20e3|99</item> <!-- TODO: fix support min sdk version (99) --> <item>fe836|0039,20e3|99</item> <!-- TODO: fix support min sdk version (99) --> <item>fe837|0030,20e3|99</item> <!-- TODO: fix support min sdk version (99) --> - <item>1f51f</item> + <item>1f51f||99</item> <!-- TODO: fix support min sdk version (99) --> <item>fe82c|0023,20e3|99</item> <!-- TODO: fix support min sdk version (99) --> <item>1f51d</item> <item>1f519</item> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index 465d52cec..66b9b7082 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -103,7 +103,7 @@ --> <string-array name="auto_correction_threshold_values" translatable="false"> <!-- Off, When auto correction setting is Off, this value is not used. --> - <item></item> + <item>floatMaxValue</item> <!-- Modest : Suggestion whose normalized score is greater than this value will be subject to auto-correction. --> <item>0.185</item> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index 2d626dbcf..18cb262e2 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -118,7 +118,7 @@ <!-- Emoji keyboard --> <fraction name="emoji_keyboard_key_width">14.2857%p</fraction> <fraction name="emoji_keyboard_row_height">33%p</fraction> - <fraction name="emoji_keyboard_key_letter_size">81%p</fraction> + <fraction name="emoji_keyboard_key_letter_size">68%p</fraction> <integer name="emoji_keyboard_max_key_count">21</integer> <dimen name="emoji_category_page_id_height">3dp</dimen> diff --git a/java/res/xml-sw600dp/rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml index fbd8492cd..cf94b06ed 100644 --- a/java/res/xml-sw600dp/rows_symbols.xml +++ b/java/res/xml-sw600dp/rows_symbols.xml @@ -68,5 +68,7 @@ latin:keyWidth="10.0%p" /> <include latin:keyboardLayout="@xml/row_symbols4" /> + <include + latin:keyboardLayout="@xml/key_f2" /> </Row> </merge> diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index 67ed9620d..c9d87bfd4 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -121,6 +121,27 @@ latin:keyIcon="!icon/emoji_key" latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> + <!-- Overriding EnterKeyStyle here --> + <switch> + <!-- Shift + Enter in textMultiLine field. --> + <case + latin:isMultiLine="true" + latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" + > + <key-style + latin:styleName="enterKeyStyle" + latin:parentStyle="shiftEnterKeyStyle" /> + </case> + <!-- Smiley in textShortMessage field. + Overrides common enter key style. --> + <case + latin:mode="im" + > + <key-style + latin:styleName="enterKeyStyle" + latin:parentStyle="emojiKeyStyle" /> + </case> + </switch> <key-style latin:styleName="tabKeyStyle" latin:code="!code/key_tab" diff --git a/java/res/xml/row_symbols4.xml b/java/res/xml/row_symbols4.xml index 0bf412fff..fbfdc5f72 100644 --- a/java/res/xml/row_symbols4.xml +++ b/java/res/xml/row_symbols4.xml @@ -39,8 +39,4 @@ <include latin:keyboardLayout="@xml/key_space_symbols" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> - <Key - latin:keyStyle="emojiKeyStyle" - latin:keyWidth="fillRight" /> - </merge> diff --git a/java/res/xml/rows_symbols.xml b/java/res/xml/rows_symbols.xml index 3f102e277..d0606c63b 100644 --- a/java/res/xml/rows_symbols.xml +++ b/java/res/xml/rows_symbols.xml @@ -60,5 +60,8 @@ latin:keyWidth="15%p" /> <include latin:keyboardLayout="@xml/row_symbols4" /> + <Key + latin:keyStyle="enterKeyStyle" + latin:keyWidth="fillRight" /> </Row> </merge> |
