diff options
Diffstat (limited to 'java/res')
73 files changed, 146 insertions, 238 deletions
diff --git a/java/res/drawable-land-mdpi/key_hint_at_holo.9.png b/java/res/drawable-land-mdpi/key_hint_at_holo.9.png Binary files differindex 627e7a0ee..d1ea313c0 100644 --- a/java/res/drawable-land-mdpi/key_hint_at_holo.9.png +++ b/java/res/drawable-land-mdpi/key_hint_at_holo.9.png diff --git a/java/res/drawable-land-mdpi/key_hint_at_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_at_large_holo.9.png Binary files differindex 9569217ae..786bbc5de 100644 --- a/java/res/drawable-land-mdpi/key_hint_at_large_holo.9.png +++ b/java/res/drawable-land-mdpi/key_hint_at_large_holo.9.png diff --git a/java/res/drawable-land-mdpi/key_hint_exclamation_holo.9.png b/java/res/drawable-land-mdpi/key_hint_exclamation_holo.9.png Binary files differindex 89c5aae85..a14623dc0 100644 --- a/java/res/drawable-land-mdpi/key_hint_exclamation_holo.9.png +++ b/java/res/drawable-land-mdpi/key_hint_exclamation_holo.9.png diff --git a/java/res/drawable-land-mdpi/key_hint_exclamation_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_exclamation_large_holo.9.png Binary files differindex 932bcb99b..ce52d3a02 100644 --- a/java/res/drawable-land-mdpi/key_hint_exclamation_large_holo.9.png +++ b/java/res/drawable-land-mdpi/key_hint_exclamation_large_holo.9.png diff --git a/java/res/drawable-land-mdpi/key_hint_question_holo.9.png b/java/res/drawable-land-mdpi/key_hint_question_holo.9.png Binary files differindex 8373b69d1..2b71d744f 100644 --- a/java/res/drawable-land-mdpi/key_hint_question_holo.9.png +++ b/java/res/drawable-land-mdpi/key_hint_question_holo.9.png diff --git a/java/res/drawable-land-mdpi/key_hint_question_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_question_large_holo.9.png Binary files differindex a9eaeea33..041336832 100644 --- a/java/res/drawable-land-mdpi/key_hint_question_large_holo.9.png +++ b/java/res/drawable-land-mdpi/key_hint_question_large_holo.9.png diff --git a/java/res/drawable-land-mdpi/key_hint_quote_holo.9.png b/java/res/drawable-land-mdpi/key_hint_quote_holo.9.png Binary files differindex 01a3a9a36..486e5e19d 100644 --- a/java/res/drawable-land-mdpi/key_hint_quote_holo.9.png +++ b/java/res/drawable-land-mdpi/key_hint_quote_holo.9.png diff --git a/java/res/drawable-land-mdpi/key_hint_quote_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_quote_large_holo.9.png Binary files differindex 7cba264c2..49770314f 100644 --- a/java/res/drawable-land-mdpi/key_hint_quote_large_holo.9.png +++ b/java/res/drawable-land-mdpi/key_hint_quote_large_holo.9.png diff --git a/java/res/drawable-land-mdpi/key_hint_underline_holo.9.png b/java/res/drawable-land-mdpi/key_hint_underline_holo.9.png Binary files differindex a95a575e5..06f3efb7e 100644 --- a/java/res/drawable-land-mdpi/key_hint_underline_holo.9.png +++ b/java/res/drawable-land-mdpi/key_hint_underline_holo.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png Binary files differindex 8002da2c5..4e1465568 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png Binary files differindex 506feece7..98461371b 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png Binary files differindex 9c34ccc5c..01a913942 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png Binary files differindex f33e4cb0c..024f57614 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png Binary files differindex f6882c0bb..072b9d7ce 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png Binary files differindex e86eea71b..12ebc9bef 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png Binary files differindex a8375d432..15053ba8d 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_light_popup_normal.9.png b/java/res/drawable-mdpi/btn_keyboard_key_light_popup_normal.9.png Binary files differindex b4a50f282..73fdba459 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_light_popup_normal.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_light_popup_normal.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png Binary files differindex 47188652a..ae3ada1a1 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png Binary files differindex dc41d58ce..2ba416fcf 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png diff --git a/java/res/drawable-mdpi/hint_popup_holo.9.png b/java/res/drawable-mdpi/hint_popup_holo.9.png Binary files differindex c409cea00..cfa17fd5f 100644 --- a/java/res/drawable-mdpi/hint_popup_holo.9.png +++ b/java/res/drawable-mdpi/hint_popup_holo.9.png diff --git a/java/res/drawable-mdpi/key_hint_at_holo.9.png b/java/res/drawable-mdpi/key_hint_at_holo.9.png Binary files differindex 627e7a0ee..d1ea313c0 100644 --- a/java/res/drawable-mdpi/key_hint_at_holo.9.png +++ b/java/res/drawable-mdpi/key_hint_at_holo.9.png diff --git a/java/res/drawable-mdpi/key_hint_at_large_holo.9.png b/java/res/drawable-mdpi/key_hint_at_large_holo.9.png Binary files differindex 9569217ae..786bbc5de 100644 --- a/java/res/drawable-mdpi/key_hint_at_large_holo.9.png +++ b/java/res/drawable-mdpi/key_hint_at_large_holo.9.png diff --git a/java/res/drawable-mdpi/key_hint_exclamation_holo.9.png b/java/res/drawable-mdpi/key_hint_exclamation_holo.9.png Binary files differindex 89c5aae85..a14623dc0 100644 --- a/java/res/drawable-mdpi/key_hint_exclamation_holo.9.png +++ b/java/res/drawable-mdpi/key_hint_exclamation_holo.9.png diff --git a/java/res/drawable-mdpi/key_hint_exclamation_large_holo.9.png b/java/res/drawable-mdpi/key_hint_exclamation_large_holo.9.png Binary files differindex 932bcb99b..ce52d3a02 100644 --- a/java/res/drawable-mdpi/key_hint_exclamation_large_holo.9.png +++ b/java/res/drawable-mdpi/key_hint_exclamation_large_holo.9.png diff --git a/java/res/drawable-mdpi/key_hint_question_holo.9.png b/java/res/drawable-mdpi/key_hint_question_holo.9.png Binary files differindex 8373b69d1..2b71d744f 100644 --- a/java/res/drawable-mdpi/key_hint_question_holo.9.png +++ b/java/res/drawable-mdpi/key_hint_question_holo.9.png diff --git a/java/res/drawable-mdpi/key_hint_question_large_holo.9.png b/java/res/drawable-mdpi/key_hint_question_large_holo.9.png Binary files differindex a9eaeea33..041336832 100644 --- a/java/res/drawable-mdpi/key_hint_question_large_holo.9.png +++ b/java/res/drawable-mdpi/key_hint_question_large_holo.9.png diff --git a/java/res/drawable-mdpi/key_hint_quote_holo.9.png b/java/res/drawable-mdpi/key_hint_quote_holo.9.png Binary files differindex 01a3a9a36..486e5e19d 100644 --- a/java/res/drawable-mdpi/key_hint_quote_holo.9.png +++ b/java/res/drawable-mdpi/key_hint_quote_holo.9.png diff --git a/java/res/drawable-mdpi/key_hint_quote_large_holo.9.png b/java/res/drawable-mdpi/key_hint_quote_large_holo.9.png Binary files differindex 7cba264c2..49770314f 100644 --- a/java/res/drawable-mdpi/key_hint_quote_large_holo.9.png +++ b/java/res/drawable-mdpi/key_hint_quote_large_holo.9.png diff --git a/java/res/drawable-mdpi/key_hint_underline_holo.9.png b/java/res/drawable-mdpi/key_hint_underline_holo.9.png Binary files differindex a95a575e5..06f3efb7e 100644 --- a/java/res/drawable-mdpi/key_hint_underline_holo.9.png +++ b/java/res/drawable-mdpi/key_hint_underline_holo.9.png diff --git a/java/res/drawable-mdpi/key_hint_underline_large_holo.9.png b/java/res/drawable-mdpi/key_hint_underline_large_holo.9.png Binary files differindex bef74c184..dbe1134cd 100644 --- a/java/res/drawable-mdpi/key_hint_underline_large_holo.9.png +++ b/java/res/drawable-mdpi/key_hint_underline_large_holo.9.png diff --git a/java/res/drawable-mdpi/keyboard_background_holo.9.png b/java/res/drawable-mdpi/keyboard_background_holo.9.png Binary files differindex 0ea57c09e..34149a482 100644 --- a/java/res/drawable-mdpi/keyboard_background_holo.9.png +++ b/java/res/drawable-mdpi/keyboard_background_holo.9.png diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_holo.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_holo.9.png Binary files differindex 8cfd7cf57..8c6ce6c8b 100644 --- a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_holo.9.png +++ b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_holo.9.png diff --git a/java/res/drawable-mdpi/keyboard_popup_panel_background_holo.9.png b/java/res/drawable-mdpi/keyboard_popup_panel_background_holo.9.png Binary files differindex c5d938dc4..da192a638 100644 --- a/java/res/drawable-mdpi/keyboard_popup_panel_background_holo.9.png +++ b/java/res/drawable-mdpi/keyboard_popup_panel_background_holo.9.png diff --git a/java/res/drawable-mdpi/mic_slash_holo.png b/java/res/drawable-mdpi/mic_slash_holo.png Binary files differindex 8108b6e13..fc4108fef 100644 --- a/java/res/drawable-mdpi/mic_slash_holo.png +++ b/java/res/drawable-mdpi/mic_slash_holo.png diff --git a/java/res/drawable-mdpi/ok_cancel_holo.9.png b/java/res/drawable-mdpi/ok_cancel_holo.9.png Binary files differindex 5eb078c70..b6f121654 100644 --- a/java/res/drawable-mdpi/ok_cancel_holo.9.png +++ b/java/res/drawable-mdpi/ok_cancel_holo.9.png diff --git a/java/res/drawable-mdpi/speak_now_level0_holo.png b/java/res/drawable-mdpi/speak_now_level0_holo.png Binary files differindex 2a4fbd839..29ec1b127 100644 --- a/java/res/drawable-mdpi/speak_now_level0_holo.png +++ b/java/res/drawable-mdpi/speak_now_level0_holo.png diff --git a/java/res/drawable-mdpi/speak_now_level1_holo.png b/java/res/drawable-mdpi/speak_now_level1_holo.png Binary files differindex dd35b1826..df5d2fae3 100644 --- a/java/res/drawable-mdpi/speak_now_level1_holo.png +++ b/java/res/drawable-mdpi/speak_now_level1_holo.png diff --git a/java/res/drawable-mdpi/speak_now_level2_holo.png b/java/res/drawable-mdpi/speak_now_level2_holo.png Binary files differindex e3e42c458..1e95ae6e9 100644 --- a/java/res/drawable-mdpi/speak_now_level2_holo.png +++ b/java/res/drawable-mdpi/speak_now_level2_holo.png diff --git a/java/res/drawable-mdpi/speak_now_level3_holo.png b/java/res/drawable-mdpi/speak_now_level3_holo.png Binary files differindex 7cf104e1f..3c6afd1a4 100644 --- a/java/res/drawable-mdpi/speak_now_level3_holo.png +++ b/java/res/drawable-mdpi/speak_now_level3_holo.png diff --git a/java/res/drawable-mdpi/speak_now_level4_holo.png b/java/res/drawable-mdpi/speak_now_level4_holo.png Binary files differindex baad6ca58..e3100c783 100644 --- a/java/res/drawable-mdpi/speak_now_level4_holo.png +++ b/java/res/drawable-mdpi/speak_now_level4_holo.png diff --git a/java/res/drawable-mdpi/speak_now_level5_holo.png b/java/res/drawable-mdpi/speak_now_level5_holo.png Binary files differindex 34c161eaf..4bc840505 100644 --- a/java/res/drawable-mdpi/speak_now_level5_holo.png +++ b/java/res/drawable-mdpi/speak_now_level5_holo.png diff --git a/java/res/drawable-mdpi/speak_now_level6_holo.png b/java/res/drawable-mdpi/speak_now_level6_holo.png Binary files differindex e6b26d139..76bad8dbd 100644 --- a/java/res/drawable-mdpi/speak_now_level6_holo.png +++ b/java/res/drawable-mdpi/speak_now_level6_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_delete_holo.png b/java/res/drawable-mdpi/sym_keyboard_delete_holo.png Binary files differindex 9f1bfe87f..d1d2d7660 100644 --- a/java/res/drawable-mdpi/sym_keyboard_delete_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_delete_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_num0_holo.png b/java/res/drawable-mdpi/sym_keyboard_num0_holo.png Binary files differindex 2bb2a8bb9..aa96c1722 100644 --- a/java/res/drawable-mdpi/sym_keyboard_num0_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_num0_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_num1_holo.png b/java/res/drawable-mdpi/sym_keyboard_num1_holo.png Binary files differindex 0e0553723..ee4b7ae0d 100644 --- a/java/res/drawable-mdpi/sym_keyboard_num1_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_num1_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_num2_holo.png b/java/res/drawable-mdpi/sym_keyboard_num2_holo.png Binary files differindex 3b2a55004..e84dcbc5e 100644 --- a/java/res/drawable-mdpi/sym_keyboard_num2_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_num2_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_num3_holo.png b/java/res/drawable-mdpi/sym_keyboard_num3_holo.png Binary files differindex 0d829bfd9..55f04c0f2 100644 --- a/java/res/drawable-mdpi/sym_keyboard_num3_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_num3_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_num4_holo.png b/java/res/drawable-mdpi/sym_keyboard_num4_holo.png Binary files differindex d676a1c16..18a744a66 100644 --- a/java/res/drawable-mdpi/sym_keyboard_num4_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_num4_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_num5_holo.png b/java/res/drawable-mdpi/sym_keyboard_num5_holo.png Binary files differindex d47f2d5f4..348f1a9b5 100644 --- a/java/res/drawable-mdpi/sym_keyboard_num5_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_num5_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_num6_holo.png b/java/res/drawable-mdpi/sym_keyboard_num6_holo.png Binary files differindex 8e9138e9b..b94baa084 100644 --- a/java/res/drawable-mdpi/sym_keyboard_num6_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_num6_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_num7_holo.png b/java/res/drawable-mdpi/sym_keyboard_num7_holo.png Binary files differindex 7453b6b6c..f6561415f 100644 --- a/java/res/drawable-mdpi/sym_keyboard_num7_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_num7_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_num8_holo.png b/java/res/drawable-mdpi/sym_keyboard_num8_holo.png Binary files differindex b59885f7e..21884c8a0 100644 --- a/java/res/drawable-mdpi/sym_keyboard_num8_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_num8_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_num9_holo.png b/java/res/drawable-mdpi/sym_keyboard_num9_holo.png Binary files differindex db465f755..3d09fc683 100644 --- a/java/res/drawable-mdpi/sym_keyboard_num9_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_num9_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_numbpound_holo.png b/java/res/drawable-mdpi/sym_keyboard_numbpound_holo.png Binary files differindex 32f736c31..d92c44935 100644 --- a/java/res/drawable-mdpi/sym_keyboard_numbpound_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_numbpound_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_numbstar_holo.png b/java/res/drawable-mdpi/sym_keyboard_numbstar_holo.png Binary files differindex 4fe9e6ae6..0792549bb 100644 --- a/java/res/drawable-mdpi/sym_keyboard_numbstar_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_numbstar_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_return_holo.png b/java/res/drawable-mdpi/sym_keyboard_return_holo.png Binary files differindex 695a163c8..91122a8d1 100644 --- a/java/res/drawable-mdpi/sym_keyboard_return_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_return_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_shift_holo.png b/java/res/drawable-mdpi/sym_keyboard_shift_holo.png Binary files differindex 8f5db5da1..8678642dd 100644 --- a/java/res/drawable-mdpi/sym_keyboard_shift_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_shift_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_shift_locked_holo.png b/java/res/drawable-mdpi/sym_keyboard_shift_locked_holo.png Binary files differindex 0305827ba..836365bf8 100644 --- a/java/res/drawable-mdpi/sym_keyboard_shift_locked_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_shift_locked_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png b/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png Binary files differindex 302ea0f05..46b2f41c7 100644 --- a/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png diff --git a/java/res/drawable-mdpi/sym_keyboard_space_holo.png b/java/res/drawable-mdpi/sym_keyboard_space_holo.png Binary files differindex ec21a4fd8..952c4ee0c 100644 --- a/java/res/drawable-mdpi/sym_keyboard_space_holo.png +++ b/java/res/drawable-mdpi/sym_keyboard_space_holo.png diff --git a/java/res/layout/candidate.xml b/java/res/layout/candidate.xml index 37179d2af..f2c4126b3 100644 --- a/java/res/layout/candidate.xml +++ b/java/res/layout/candidate.xml @@ -23,6 +23,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/candidate_strip_height" android:orientation="horizontal" + android:paddingRight="@dimen/candidate_padding" > <ImageView android:id="@+id/candidate_divider" @@ -37,13 +38,23 @@ android:id="@+id/candidate_word" android:layout_width="wrap_content" android:layout_height="@dimen/candidate_strip_height" - android:minWidth="@dimen/candidate_min_touchable_width" + android:minWidth="@dimen/candidate_min_width" android:textSize="@dimen/candidate_text_size" android:textColor="@color/candidate_normal" android:background="@drawable/btn_candidate" android:focusable="true" android:clickable="true" android:gravity="center_vertical|center_horizontal" - android:paddingLeft="12dip" - android:paddingRight="12dip" /> + android:paddingLeft="@dimen/candidate_padding" /> + <TextView + android:id="@+id/candidate_debug_info" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" + android:textSize="10dip" + android:textColor="#ff808080" + android:focusable="false" + android:clickable="false" + android:gravity="bottom" + android:paddingLeft="4dip" /> </LinearLayout> diff --git a/java/res/values-xlarge/bools.xml b/java/res/values-xlarge/bools.xml index abacfa18b..9fb670c54 100644 --- a/java/res/values-xlarge/bools.xml +++ b/java/res/values-xlarge/bools.xml @@ -21,6 +21,7 @@ <!-- Whether or not Popup on key press is enabled by default --> <bool name="default_popup_preview">false</bool> <bool name="config_enable_show_settings_key_option">false</bool> + <bool name="config_enable_show_subtype_settings">false</bool> <bool name="config_enable_show_voice_key_option">false</bool> <bool name="config_candidate_highlight_font_color_enabled">false</bool> </resources> diff --git a/java/res/values-xlarge/dimens.xml b/java/res/values-xlarge/dimens.xml index dbdfa9631..07d5f09bd 100644 --- a/java/res/values-xlarge/dimens.xml +++ b/java/res/values-xlarge/dimens.xml @@ -44,5 +44,7 @@ <dimen name="candidate_strip_height">46dip</dimen> <dimen name="candidate_strip_padding">15.0mm</dimen> + <dimen name="candidate_min_width">0.3in</dimen> + <dimen name="candidate_padding">12dip</dimen> <dimen name="candidate_text_size">22dip</dimen> </resources> diff --git a/java/res/values/bools.xml b/java/res/values/bools.xml index 84b0fe182..8742676ad 100644 --- a/java/res/values/bools.xml +++ b/java/res/values/bools.xml @@ -31,6 +31,7 @@ <bool name="default_recorrection_enabled">true</bool> <bool name="config_long_press_comma_for_settings_enabled">true</bool> <bool name="config_enable_show_settings_key_option">true</bool> + <bool name="config_enable_show_subtype_settings">true</bool> <bool name="config_enable_show_voice_key_option">true</bool> <bool name="config_candidate_highlight_font_color_enabled">true</bool> </resources> diff --git a/java/res/values/config.xml b/java/res/values/config.xml index 456d9ad4d..0bb0e337d 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -32,14 +32,14 @@ <integer name="config_long_press_key_timeout">400</integer> <integer name="config_long_press_shift_key_timeout">1200</integer> <integer name="config_multi_tap_key_timeout">800</integer> - <string-array name="auto_complete_threshold_values"> - <!-- Off, When auto completing setting is Off, this value is not used. --> + <string-array name="auto_correction_threshold_values"> + <!-- Off, When auto correction setting is Off, this value is not used. --> <item></item> <!-- Modest : Suggestion whose normalized score is greater than this value - will be subject to auto-completion. --> + will be subject to auto-correction. --> <item>0.22</item> <!-- Aggressive : Suggestion whose normalized score is greater than this value - will be subject to auto-completion. --> + will be subject to auto-correction. --> <item>0</item> </string-array> </resources> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index 27d324bd8..41d638440 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -49,6 +49,8 @@ <dimen name="candidate_strip_height">42dip</dimen> <dimen name="candidate_strip_fading_edge_length">63dip</dimen> <dimen name="candidate_strip_padding">0dip</dimen> + <dimen name="candidate_min_width">0.3in</dimen> + <dimen name="candidate_padding">0dip</dimen> <dimen name="candidate_text_size">18dip</dimen> <dimen name="spacebar_vertical_correction">4dip</dimen> <!-- If the screen height in landscape is larger than the below value, then the keyboard @@ -57,5 +59,4 @@ <dimen name="bubble_pointer_offset">22dip</dimen> <dimen name="key_hysteresis_distance">0.05in</dimen> - <dimen name="candidate_min_touchable_width">0.3in</dimen> </resources> diff --git a/java/res/values/donottranslate-altchars.xml b/java/res/values/donottranslate-altchars.xml index 41c498ee3..de4250edf 100644 --- a/java/res/values/donottranslate-altchars.xml +++ b/java/res/values/donottranslate-altchars.xml @@ -43,4 +43,14 @@ <string name="alternates_for_scandinavia_row2_11"></string> <string name="alternates_for_cyrillic_e"></string> <string name="alternates_for_cyrillic_soft_sign"></string> + <!-- popular web domains for the locale - most popular, displayed on the keyboard --> + <string name="popular_domain_0">".com"</string> + <!-- popular web domains for the locale - item 1, displayed in the popup --> + <string name="popular_domain_1">".net"</string> + <!-- popular web domains for the locale - item 2, displayed in the popup --> + <string name="popular_domain_2">".org"</string> + <!-- popular web domains for the locale - item 3, displayed in the popup --> + <string name="popular_domain_3">".gov"</string> + <!-- popular web domains for the locale - item 4, displayed in the popup --> + <string name="popular_domain_4">".edu"</string> </resources> diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 453e188ff..57037290a 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -27,31 +27,93 @@ <!-- Option values to show/hide the settings key in onscreen keyboard --> <!-- Automatically decide to show or hide the settings key --> - <string name="settings_key_mode_auto" translatable="false">0</string> + <string name="settings_key_mode_auto">0</string> <!-- Always show the settings key --> - <string name="settings_key_mode_always_show" translatable="false">1</string> + <string name="settings_key_mode_always_show">1</string> <!-- Always hide the settings key --> - <string name="settings_key_mode_always_hide" translatable="false">2</string> + <string name="settings_key_mode_always_hide">2</string> + <!-- Array of the settings key mode values --> + <string-array name="settings_key_modes_values"> + <item>@string/settings_key_mode_auto</item> + <item>@string/settings_key_mode_always_show</item> + <item>@string/settings_key_mode_always_hide</item> + </string-array> + <!-- Array of the settings key modes --> + <string-array name="settings_key_modes"> + <item>@string/settings_key_mode_auto_name</item> + <item>@string/settings_key_mode_always_show_name</item> + <item>@string/settings_key_mode_always_hide_name</item> + </string-array> <!-- Always show the suggestion strip --> - <string name="prefs_suggestion_visibility_show_value" translatable="false">0</string> + <string name="prefs_suggestion_visibility_show_value">0</string> <!-- Show the suggestion strip only on portrait mode --> - <string name="prefs_suggestion_visibility_show_only_portrait_value" translatable="false">1</string> + <string name="prefs_suggestion_visibility_show_only_portrait_value">1</string> <!-- Always hide the suggestion strip --> - <string name="prefs_suggestion_visibility_hide_value" translatable="false">2</string> + <string name="prefs_suggestion_visibility_hide_value">2</string> <!-- Default value of the visibility of the suggestion strip --> - <string name="prefs_suggestion_visibility_default_value" translatable="false">0</string> + <string name="prefs_suggestion_visibility_default_value">0</string> + <!-- Option to show/hide the suggestion strip --> + <string-array name="prefs_suggestion_visibility_values"> + <item>@string/prefs_suggestion_visibility_show_value</item> + <item>@string/prefs_suggestion_visibility_show_only_portrait_value</item> + <item>@string/prefs_suggestion_visibility_hide_value</item> + </string-array> + <string-array name="prefs_suggestion_visibilities"> + <item>@string/prefs_suggestion_visibility_show_name</item> + <item>@string/prefs_suggestion_visibility_show_only_portrait_name</item> + <item>@string/prefs_suggestion_visibility_hide_name</item> + </string-array> + + <string name="auto_correction_threshold_mode_index_off">0</string> + <string name="auto_correction_threshold_mode_index_modest">1</string> + <string name="auto_correction_threshold_mode_index_aggeressive">2</string> + <string-array name="auto_correction_threshold_mode_indexes"> + <item>@string/auto_correction_threshold_mode_index_off</item> + <item>@string/auto_correction_threshold_mode_index_modest</item> + <item>@string/auto_correction_threshold_mode_index_aggeressive</item> + </string-array> + <string-array name="auto_correction_threshold_modes"> + <item>@string/auto_correction_threshold_mode_off</item> + <item>@string/auto_correction_threshold_mode_modest</item> + <item>@string/auto_correction_threshold_mode_aggeressive</item> + </string-array> + + <string name="voice_mode_main">0</string> + <string name="voice_mode_symbols">1</string> + <string name="voice_mode_off">2</string> + <string-array name="voice_input_modes_values"> + <item>@string/voice_mode_main</item> + <item>@string/voice_mode_symbols</item> + <item>@string/voice_mode_off</item> + </string-array> + <!-- Array of Voice Input modes --> + <string-array name="voice_input_modes"> + <item>@string/voice_input_modes_main_keyboard</item> + <item>@string/voice_input_modes_symbols_keyboard</item> + <item>@string/voice_input_modes_off</item> + </string-array> + <!-- Array of Voice Input modes summary --> + <string-array name="voice_input_modes_summary"> + <item>@string/voice_input_modes_summary_main_keyboard</item> + <item>@string/voice_input_modes_summary_symbols_keyboard</item> + <item>@string/voice_input_modes_summary_off</item> + </string-array> + + <!-- Title for Latin keyboard debug settings activity / dialog --> + <string name="english_ime_debug_settings">Android keyboard Debug settings</string> + <string name="prefs_debug_mode">Debug Mode</string> <!-- Keyboard theme names --> - <string name="layout_basic" translatable="false">Basic</string> - <string name="layout_high_contrast" translatable="false">Basic (High Contrast)</string> - <string name="layout_stone_bold" translatable="false">Stone (bold)</string> - <string name="layout_stone_normal" translatable="false">Stone (normal)</string> - <string name="layout_gingerbread" translatable="false">Gingerbread</string> - <string name="layout_honeycomb" translatable="false">Honeycomb</string> + <string name="layout_basic">Basic</string> + <string name="layout_high_contrast">Basic (High Contrast)</string> + <string name="layout_stone_bold">Stone (bold)</string> + <string name="layout_stone_normal">Stone (normal)</string> + <string name="layout_gingerbread">Gingerbread</string> + <string name="layout_honeycomb">Honeycomb</string> <!-- For keyboard theme switcher dialog --> - <string-array name="keyboard_layout_modes" translatable="false"> + <string-array name="keyboard_layout_modes"> <item>@string/layout_basic</item> <item>@string/layout_high_contrast</item> <item>@string/layout_stone_normal</item> @@ -59,7 +121,7 @@ <item>@string/layout_gingerbread</item> <item>@string/layout_honeycomb</item> </string-array> - <string-array name="keyboard_layout_modes_values" translatable="false"> + <string-array name="keyboard_layout_modes_values"> <item>0</item> <item>1</item> <item>2</item> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index da315df80..c244ad214 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -34,182 +34,54 @@ <!-- Option to control whether or not to show a popup with a larger font on each key press. --> <string name="popup_on_keypress">Popup on keypress</string> - <!-- Option to enable using nearby keys when correcting/predicting --> - <string name="hit_correction">Correct typing errors</string> - - <!-- Description for hit_correction --> - <string name="hit_correction_summary">Enable input error correction</string> - - <!-- Option to enable using nearby keys when correcting/predicting in landscape--> - <string name="hit_correction_land">Landscape input errors</string> - - <!-- Description for hit_correction in landscape --> - <string name="hit_correction_land_summary">Enable input error correction</string> - - <!-- Option to automatically correct word on hitting space --> - <string name="auto_correction">Word suggestions</string> - - <!-- Description for auto_correction --> - <string name="auto_correction_summary">Automatically correct the previous word</string> - - <!-- Option to enable text prediction --> - <string name="prediction">Word suggestions</string> <!-- Category title for text prediction --> <string name="prediction_category">Word suggestion settings</string> - <!-- Description for text prediction --> - <string name="prediction_summary">Enable auto completion while typing</string> - - <!-- Dialog title for auto complete choices --> - <string name="auto_complete_dialog_title">Auto completion</string> - - <!-- Option to enable text prediction in landscape --> - <string name="prediction_landscape">Increase text field size</string> - <!-- Description for text prediction --> - <string name="prediction_landscape_summary">Hide word suggestions in landscape view</string> <!-- Option to enable auto capitalization of sentences --> <string name="auto_cap">Auto-capitalization</string> - <!-- Description for auto cap --> - <string name="auto_cap_summary">Capitalize the start of a sentence</string> - <!-- Option to enable auto punctuate --> - <string name="auto_punctuate">Auto-punctuate</string> - <!-- Description for auto punctuate --> - <string name="auto_punctuate_summary"></string> - + <!-- Option to enable quick fixes --> <string name="quick_fixes">Quick fixes</string> <!-- Description for quick fixes --> <string name="quick_fixes_summary">Corrects commonly typed mistakes</string> - + <!-- Option to enable showing suggestions --> <string name="prefs_show_suggestions">Show suggestions</string> <!-- Description for show suggestions --> <string name="prefs_show_suggestions_summary">Display suggested words while typing</string> - <!-- Option to show/hide the suggestion strip --> - <string-array name="prefs_suggestion_visibility_values" translatable="false"> - <item>@string/prefs_suggestion_visibility_show_value</item> - <item>@string/prefs_suggestion_visibility_show_only_portrait_value</item> - <item>@string/prefs_suggestion_visibility_hide_value</item> - </string-array> <string name="prefs_suggestion_visibility_show_name">Always show</string> <string name="prefs_suggestion_visibility_show_only_portrait_name">Show on portrait mode</string> <string name="prefs_suggestion_visibility_hide_name">Always hide</string> - <string-array name="prefs_suggestion_visibilities" translatable="false"> - <item>@string/prefs_suggestion_visibility_show_name</item> - <item>@string/prefs_suggestion_visibility_show_only_portrait_name</item> - <item>@string/prefs_suggestion_visibility_hide_name</item> - </string-array> <!-- Option to show/hide the settings key --> <string name="prefs_settings_key">Show settings key</string> - <!-- Array of the settings key mode values --> - <string-array name="settings_key_modes_values" translatable="false"> - <item>@string/settings_key_mode_auto</item> - <item>@string/settings_key_mode_always_show</item> - <item>@string/settings_key_mode_always_hide</item> - </string-array> <!-- Option to automatically decide to show/hide the settings key --> <string name="settings_key_mode_auto_name">Automatic</string> <!-- Option to always show the settings key --> <string name="settings_key_mode_always_show_name">Always show</string> <!-- Option to always hide the settings key --> <string name="settings_key_mode_always_hide_name">Always hide</string> - <!-- Array of the settings key modes --> - <string-array name="settings_key_modes"> - <item>@string/settings_key_mode_auto_name</item> - <item>@string/settings_key_mode_always_show_name</item> - <item>@string/settings_key_mode_always_hide_name</item> - </string-array> - - <!-- Option to decide the auto completion threshold score --> - <!-- Option to enable auto completion --> - <string name="auto_complete">Auto-complete</string> - <!-- Description for auto completion --> - <string name="auto_complete_summary">Spacebar and punctuation automatically insert highlighted word</string> - <string name="auto_completion_threshold_mode_value_off" translatable="false">0</string> - <string name="auto_completion_threshold_mode_value_modest" translatable="false">1</string> - <string name="auto_completion_threshold_mode_value_aggeressive" translatable="false">2</string> - <string-array name="auto_completion_threshold_mode_values" translatable="false"> - <item>@string/auto_completion_threshold_mode_value_off</item> - <item>@string/auto_completion_threshold_mode_value_modest</item> - <item>@string/auto_completion_threshold_mode_value_aggeressive</item> - </string-array> - <!-- Option to disable auto completion. --> - <string name="auto_completion_threshold_mode_off">Off</string> + + <!-- Option to decide the auto correction threshold score --> + <!-- Option to enable auto correction --> + <string name="auto_correction">Auto correction</string> + <!-- Description for auto correction --> + <string name="auto_correction_summary">Spacebar and punctuation automatically insert highlighted word</string> + <!-- Option to disable auto correction. --> + <string name="auto_correction_threshold_mode_off">Off</string> <!-- Option to use modest auto completion. --> - <string name="auto_completion_threshold_mode_modest">Modest</string> + <string name="auto_correction_threshold_mode_modest">Modest</string> <!-- Option to use aggressive auto completion. --> - <string name="auto_completion_threshold_mode_aggeressive">Aggressive</string> - <string-array name="auto_completion_threshold_modes"> - <item>@string/auto_completion_threshold_mode_off</item> - <item>@string/auto_completion_threshold_mode_modest</item> - <item>@string/auto_completion_threshold_mode_aggeressive</item> - </string-array> + <string name="auto_correction_threshold_mode_aggeressive">Aggressive</string> <!-- Option to enable bigram completion --> <string name="bigram_suggestion">Bigram Suggestions</string> <!-- Description for auto completion --> <string name="bigram_suggestion_summary">Use previous word to improve suggestion</string> - <!-- Array of prediction modes --> - <string-array name="prediction_modes"> - <item>None</item> - <item>Basic</item> - <item>Advanced</item> - </string-array> - - <!-- Don't translate --> - <string name="prediction_none" translatable="false">0</string> - <!-- Don't translate --> - <string name="prediction_basic" translatable="false">1</string> - <!-- Don't translate --> - <string name="prediction_full" translatable="false">2</string> - - <string-array name="prediction_modes_values" translatable="false"> - <item>@string/prediction_none</item> - <item>@string/prediction_basic</item> - <item>@string/prediction_full</item> - </string-array> - <!-- Indicates that a word has been added to the dictionary --> <string name="added_word"><xliff:g id="word">%s</xliff:g> : Saved</string> - <!-- Tip to long press on keys --> - <string name="tip_long_press">Hold a key down to see accents (ø, ö, etc.)</string> - <!-- Tip to dismiss keyboard --> - <string name="tip_dismiss">Press the back key \u21B6 to close the keyboard at any point</string> - <!-- Tip to press ?123 to access numbers and symbols --> - <string name="tip_access_symbols">Access numbers and symbols</string> - <!-- Tip to long press on typed word to add to dictionary --> - <string name="tip_add_to_dictionary">Press and hold the left-most word to add it to the dictionary - </string> - - <!-- Instruction to touch the bubble to continue --> - <string name="touch_to_continue">Touch this hint to continue »</string> - - <!-- Instruction to touch the bubble to start typing --> - <string name="touch_to_finish">Touch here to close this hint and start typing!</string> - - <!-- Tutorial tip 1 - The keyboard opens any time you touch a text field --> - <string name="tip_to_open_keyboard"><b>The keyboard opens any time you touch a text field</b></string> - - <!-- Tutorial tip 2 - Touch and hold a key to view accents (examples) --> - <string name="tip_to_view_accents"><b>Touch & hold a key to view accents\n(ø, ö, ô, ó, and so on)</b> - </string> - - <!-- Tutorial tip 3 - How to switch to number/symbol keyboard --> - <string name="tip_to_open_symbols"><b>Switch to numbers and symbols by touching this key</b></string> - - <!-- Tutorial tip 4 - How to switch back to alphabet keyboard --> - <string name="tip_to_close_symbols"><b>Go back to letters by touching this key again</b></string> - - <!-- Tutorial tip 5 - How to launch keyboard settings --> - <string name="tip_to_launch_settings"><b>Touch & hold this key to change keyboard settings, like auto complete</b></string> - - <!-- Tutorial tip 6 - Done with the tutorial --> - <string name="tip_to_start_typing"><b>Try it!</b></string> - - <!-- Label for soft enter key when it performs GO action. Must be short to fit on key! --> <string name="label_go_key">Go</string> <!-- Label for soft enter key when it performs NEXT action. Must be short to fit on key! --> @@ -308,62 +180,14 @@ <!-- Preferences item for enabling speech input --> <string name="voice_input">Voice input</string> - <!-- Array of Voice Input modes --> - <string-array name="voice_input_modes"> - <item>On main keyboard</item> - <item>On symbols keyboard</item> - <item>Off</item> - </string-array> - - <!-- Don't translate --> - <string name="voice_mode_main" translatable="false">0</string> - <!-- Don't translate --> - <string name="voice_mode_symbols" translatable="false">1</string> - <!-- Don't translate --> - <string name="voice_mode_off" translatable="false">2</string> - - <string-array name="voice_input_modes_values" translatable="false"> - <item>@string/voice_mode_main</item> - <item>@string/voice_mode_symbols</item> - <item>@string/voice_mode_off</item> - </string-array> - - <!-- Array of Voice Input modes summary --> - <string-array name="voice_input_modes_summary"> - <item>Mic on main keyboard</item> - <item>Mic on symbols keyboard</item> - <item>Voice input is disabled</item> - </string-array> - - <!-- Press the "enter" key after the user speaks. Option on settings.--> - <string name="auto_submit">Auto submit after voice</string> - - <!-- Press the "enter" key after the user speaks. Summary of option in settings.--> - <string name="auto_submit_summary">Automatically press enter when searching or going to the next field.</string> - - <!-- IME Tutorial screen (ROMAN) --><skip /> - <!-- appears above image showing the user to click on a TextView to show the IME --> - <string name="open_the_keyboard"><font size="17"><b>Open the keyboard\n</b></font><font size="3">\n</font>Touch any text field.</string> - - <!-- appears above the image showing the back button used to close the keyboard --> - <string name="close_the_keyboard"><font size="17"><b>Close the keyboard\n</b></font><font size="3">\n</font>Press the Back key.</string> - - <!-- appears above image showing how to use touch and hold --> - <string name="touch_and_hold"><font size="17"><b>Touch \u0026 hold a key for options\n</b></font><font size="3">\n</font>Access punctuation and accents.</string> - - <!-- appears above image showing how to access keyboard settings --> - <string name="keyboard_settings"><font size="17"><b>Keyboard settings\n</b></font><font size="3">\n</font>Touch \u0026 hold the <b>\?123\</b> key.</string> - - <!-- popular web domains for the locale - most popular, displayed on the keyboard --> - <string name="popular_domain_0">".com"</string> - <!-- popular web domains for the locale - item 1, displayed in the popup --> - <string name="popular_domain_1">".net"</string> - <!-- popular web domains for the locale - item 2, displayed in the popup --> - <string name="popular_domain_2">".org"</string> - <!-- popular web domains for the locale - item 3, displayed in the popup --> - <string name="popular_domain_3">".gov"</string> - <!-- popular web domains for the locale - item 4, displayed in the popup --> - <string name="popular_domain_4">".edu"</string> + <!-- Voice Input modes --> + <string name="voice_input_modes_main_keyboard">On main keyboard</string> + <string name="voice_input_modes_symbols_keyboard">On symbols keyboard</string> + <string name="voice_input_modes_off">Off</string> + <!-- Voice Input modes summary --> + <string name="voice_input_modes_summary_main_keyboard">Mic on main keyboard</string> + <string name="voice_input_modes_summary_symbols_keyboard">Mic on symbols keyboard</string> + <string name="voice_input_modes_summary_off">Voice input is disabled</string> <!-- Menu item for launching Input method picker --> <string name="selectInputMethod">Select input method</string> @@ -391,8 +215,6 @@ <!-- Description for keyboard theme switcher --> <string name="keyboard_layout">Keyboard Theme</string> - <string name="subtype_mode_keyboard">keyboard</string> - <string name="subtype_mode_voice">voice</string> <string name="subtype_mode_cs_keyboard">Czech Keyboard</string> <string name="subtype_mode_da_keyboard">Danish Keyboard</string> <string name="subtype_mode_de_keyboard">German Keyboard</string> @@ -428,9 +250,6 @@ <string name="subtype_mode_zh_CN_voice">Chinese (China) Voice</string> <string name="subtype_mode_zh_TW_voice">Chinese (Taiwan) Voice</string> - <!-- Title for Latin keyboard debug settings activity / dialog --> - <string name="english_ime_debug_settings" translatable="false">Android keyboard Debug settings</string> - <string name="prefs_debug_mode" translatable="false">Debug Mode</string> <!-- Title of an option for usability study mode --> <string name="prefs_usability_study_mode">Usability Study Mode</string> </resources> diff --git a/java/res/xml-xlarge/kbd_key_styles.xml b/java/res/xml-xlarge/kbd_key_styles.xml index 8a1f6ffc6..9ff3340b8 100644 --- a/java/res/xml-xlarge/kbd_key_styles.xml +++ b/java/res/xml-xlarge/kbd_key_styles.xml @@ -153,9 +153,9 @@ latin:isSticky="true" /> <key-style latin:styleName="comKeyStyle" - latin:keyLabel=".com" + latin:keyLabel="@string/popular_domain_0" latin:keyLabelOption="fontNormal" - latin:keyOutputText=".com" + latin:keyOutputText="@string/popular_domain_0" latin:keyHintIcon="@drawable/hint_popup_holo" latin:popupKeyboard="@xml/popup_domains" /> </merge> diff --git a/java/res/xml-xlarge/kbd_symbols.xml b/java/res/xml-xlarge/kbd_symbols.xml index f5d0c4c47..f78af8abd 100644 --- a/java/res/xml-xlarge/kbd_symbols.xml +++ b/java/res/xml-xlarge/kbd_symbols.xml @@ -137,10 +137,6 @@ latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="≥»›" /> <Key - latin:keyLabel="[" /> - <Key - latin:keyLabel="]" /> - <Key latin:keyLabel="=" latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="≠≈" /> @@ -149,6 +145,10 @@ <Key latin:keyLabel=";" /> <Key + latin:keyLabel="," /> + <Key + latin:keyLabel="." /> + <Key latin:keyLabel="!" latin:popupKeyboard="@xml/kbd_popup_template" latin:popupCharacters="¡" /> diff --git a/java/res/xml-xlarge/kbd_symbols_shift.xml b/java/res/xml-xlarge/kbd_symbols_shift.xml index 99f48ebd9..f3fbf36d1 100644 --- a/java/res/xml-xlarge/kbd_symbols_shift.xml +++ b/java/res/xml-xlarge/kbd_symbols_shift.xml @@ -121,9 +121,9 @@ <Key latin:keyLabel="℅" /> <Key - latin:keyLabel="," /> + latin:keyLabel="[" /> <Key - latin:keyLabel="." /> + latin:keyLabel="]" /> <Key latin:keyLabel="¡" /> <Key diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index 85612b049..47b3b4589 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -73,6 +73,7 @@ <!-- TODO: Filter subtypes by IME in SubtypeEnabler --> <!-- TODO: Maybe use this only for phone? --> <PreferenceScreen + android:key="subtype_settings" android:title="@string/language_selection_title" android:summary="@string/language_selection_summary"> <intent @@ -102,13 +103,13 @@ /> <ListPreference - android:key="auto_completion_threshold" - android:title="@string/auto_complete" - android:summary="@string/auto_complete_summary" + android:key="auto_correction_threshold" + android:title="@string/auto_correction" + android:summary="@string/auto_correction_summary" android:persistent="true" - android:entryValues="@array/auto_completion_threshold_mode_values" - android:entries="@array/auto_completion_threshold_modes" - android:defaultValue="@string/auto_completion_threshold_mode_value_modest" + android:entryValues="@array/auto_correction_threshold_mode_indexes" + android:entries="@array/auto_correction_threshold_modes" + android:defaultValue="@string/auto_correction_threshold_mode_index_modest" /> <CheckBoxPreference |
