diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/config.xml | 11 | ||||
| -rw-r--r-- | java/res/values/keycodes.xml | 6 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 16 | ||||
| -rw-r--r-- | java/res/xml-xlarge/kbd_key_styles.xml | 4 | ||||
| -rw-r--r-- | java/res/xml/kbd_ar_rows.xml | 4 | ||||
| -rw-r--r-- | java/res/xml/kbd_key_styles.xml | 4 | ||||
| -rw-r--r-- | java/res/xml/prefs.xml | 55 | ||||
| -rw-r--r-- | java/res/xml/prefs_for_debug.xml | 7 |
8 files changed, 73 insertions, 34 deletions
diff --git a/java/res/values/config.xml b/java/res/values/config.xml index 300aaa423..4651de785 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -37,18 +37,23 @@ <bool name="config_default_popup_preview">true</bool> <!-- Default values for whether quick fixes and bigram suggestions are activated --> <bool name="config_default_quick_fixes">true</bool> + <!-- Default value for bigram suggestion: while showing candidates for a word should we weigh + in the previous word? --> <bool name="config_default_bigram_suggestions">true</bool> + <!-- Default value for bigram prediction: after entering a word and a space only, should we look + at input history to suggest a hopefully helpful candidate for the next word? --> + <bool name="config_default_bigram_prediction">false</bool> <bool name="config_default_recorrection_enabled">true</bool> <bool name="config_default_sound_enabled">false</bool> <bool name="config_use_spacebar_language_switcher">true</bool> <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false --> <bool name="config_show_mini_keyboard_at_touched_point">false</bool> <!-- The language is never displayed if == 0, always displayed if < 0 --> - <integer name="config_delay_before_fadeout_language_on_spacebar">-1</integer> + <integer name="config_delay_before_fadeout_language_on_spacebar">1200</integer> <integer name="config_duration_of_fadeout_language_on_spacebar">50</integer> - <integer name="config_final_fadeout_percentage_of_language_on_spacebar">15</integer> + <integer name="config_final_fadeout_percentage_of_language_on_spacebar">50</integer> <integer name="config_delay_before_preview">0</integer> - <integer name="config_delay_after_preview">10</integer> + <integer name="config_delay_after_preview">60</integer> <integer name="config_mini_keyboard_fadein_anim_time">0</integer> <integer name="config_mini_keyboard_fadeout_anim_time">100</integer> <integer name="config_delay_before_key_repeat_start">400</integer> diff --git a/java/res/values/keycodes.xml b/java/res/values/keycodes.xml index d6f9bfc28..0f0a74aea 100644 --- a/java/res/values/keycodes.xml +++ b/java/res/values/keycodes.xml @@ -26,8 +26,8 @@ <integer name="key_shift">-1</integer> <integer name="key_switch_alpha_symbol">-2</integer> <integer name="key_delete">-5</integer> - <integer name="key_settings">-100</integer> - <integer name="key_voice">-102</integer> + <integer name="key_settings">-6</integer> + <integer name="key_shortcut">-8</integer> <!-- Array used for mapping key codes to description strings. --> <array name="key_descriptions"> @@ -45,7 +45,7 @@ <item>@string/description_delete_key</item> <item>@integer/key_settings</item> <item>@string/description_settings_key</item> - <item>@integer/key_voice</item> + <item>@integer/key_shortcut</item> <item>@string/description_voice_key</item> </array> </resources> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 66dc7d71c..dca4b91e9 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -38,7 +38,13 @@ <string name="general_category">General</string> <!-- Category title for text prediction --> - <string name="prediction_category">Text correction</string> + <string name="correction_category">Text correction</string> + + <!-- Category title for ngrams --> + <string name="ngram_category">Suggestions based on previous words</string> + + <!-- Category title for misc options --> + <string name="misc_category">Other options</string> <!-- Option to enable auto capitalization of sentences --> <string name="auto_cap">Auto-capitalization</string> @@ -55,6 +61,8 @@ <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> + <!-- Option to enable spacebar language switcher [CHAR LIMIT=20]--> + <string name="prefs_use_spacebar_language_switch">Use the spacebar language switcher</string> <!-- Option to show/hide the settings key --> <string name="prefs_settings_key">Show settings key</string> @@ -78,9 +86,13 @@ <string name="auto_correction_threshold_mode_aggeressive">Aggressive</string> <!-- Option to enable bigram correction --> - <string name="bigram_suggestion">Bigram Suggestions</string> + <string name="bigram_suggestion">Bigram suggestions</string> <!-- Description for auto correction --> <string name="bigram_suggestion_summary">Use previous word to improve suggestion</string> + <!-- Option to enable using user-history bigram when no input --> + <string name="bigram_prediction">Bigram prediction</string> + <!-- Description for auto correction --> + <string name="bigram_prediction_summary">Use previous word also for prediction</string> <!-- Indicates that a word has been added to the dictionary --> <string name="added_word"><xliff:g id="word">%s</xliff:g> : Saved</string> diff --git a/java/res/xml-xlarge/kbd_key_styles.xml b/java/res/xml-xlarge/kbd_key_styles.xml index 4fefe0056..57eaccbae 100644 --- a/java/res/xml-xlarge/kbd_key_styles.xml +++ b/java/res/xml-xlarge/kbd_key_styles.xml @@ -73,7 +73,7 @@ latin:parentStyle="functionalKeyStyle" /> <key-style latin:styleName="micKeyStyle" - latin:code="@integer/key_voice" + latin:code="@integer/key_shortcut" latin:keyIcon="@drawable/sym_keyboard_voice_holo" latin:iconPreview="@drawable/sym_keyboard_feedback_mic" latin:parentStyle="functionalKeyStyle" /> @@ -127,7 +127,7 @@ latin:parentStyle="functionalKeyStyle" /> <key-style latin:styleName="micKeyStyle" - latin:code="@integer/key_voice" + latin:code="@integer/key_shortcut" latin:keyIcon="@drawable/sym_bkeyboard_mic" latin:iconPreview="@drawable/sym_keyboard_feedback_mic" latin:parentStyle="functionalKeyStyle" /> diff --git a/java/res/xml/kbd_ar_rows.xml b/java/res/xml/kbd_ar_rows.xml index d5264fd2d..b2ea45701 100644 --- a/java/res/xml/kbd_ar_rows.xml +++ b/java/res/xml/kbd_ar_rows.xml @@ -87,7 +87,7 @@ latin:keyEdgeFlags="right" /> </Row> <Row - latin:keyWidth="10%p" + latin:keyWidth="9.7%p" > <Key latin:keyLabel="ظ" @@ -112,7 +112,7 @@ latin:keyLabel="ث" /> <Key latin:keyStyle="deleteKeyStyle" - latin:visualInsetsLeft="2%p" + latin:keyWidth="12%p" latin:keyEdgeFlags="right" /> </Row> <include latin:keyboardLayout="@xml/kbd_qwerty_row4" /> diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml index bfc7c4ff2..4792e1f00 100644 --- a/java/res/xml/kbd_key_styles.xml +++ b/java/res/xml/kbd_key_styles.xml @@ -118,7 +118,7 @@ latin:parentStyle="functionalKeyStyle" /> <key-style latin:styleName="micKeyStyle" - latin:code="@integer/key_voice" + latin:code="@integer/key_shortcut" latin:keyIcon="@drawable/sym_keyboard_mic" latin:iconPreview="@drawable/sym_keyboard_feedback_mic" latin:parentStyle="settingsPopupStyle" /> @@ -191,7 +191,7 @@ latin:parentStyle="functionalKeyStyle" /> <key-style latin:styleName="micKeyStyle" - latin:code="@integer/key_voice" + latin:code="@integer/key_shortcut" latin:keyIcon="@drawable/sym_bkeyboard_mic" latin:iconPreview="@drawable/sym_keyboard_feedback_mic" latin:parentStyle="settingsPopupStyle" /> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index cbfc3c39d..24a1d45a5 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -66,8 +66,8 @@ android:summary="@string/language_selection_summary" /> </PreferenceCategory> <PreferenceCategory - android:title="@string/prediction_category" - android:key="prediction_settings"> + android:title="@string/correction_category" + android:key="correction_settings"> <CheckBoxPreference android:key="quick_fixes" android:title="@string/quick_fixes" @@ -90,31 +90,46 @@ android:entryValues="@array/prefs_suggestion_visibility_values" android:entries="@array/prefs_suggestion_visibilities" android:defaultValue="@string/prefs_suggestion_visibility_default_value" /> + </PreferenceCategory> + <PreferenceCategory + android:title="@string/ngram_category" + android:key="ngram_settings"> <CheckBoxPreference android:key="bigram_suggestion" android:title="@string/bigram_suggestion" android:summary="@string/bigram_suggestion_summary" android:persistent="true" android:defaultValue="true" /> + <CheckBoxPreference + android:key="bigram_prediction" + android:dependency="bigram_suggestion" + android:title="@string/bigram_prediction" + android:summary="@string/bigram_prediction_summary" + android:persistent="true" + android:defaultValue="false" /> + </PreferenceCategory> + <PreferenceCategory + android:title="@string/misc_category" + android:key="misc_settings"> + <CheckBoxPreference + android:key="usability_study_mode" + android:title="@string/prefs_usability_study_mode" + android:persistent="true" + android:defaultValue="false" /> + <CheckBoxPreference + android:key="enable_logging" + android:title="@string/prefs_enable_log" + android:summary="@string/prefs_description_log" + android:persistent="true" + android:defaultValue="true" /> + <ListPreference + android:key="pref_keyboard_layout_20100902" + android:title="@string/keyboard_layout" + android:persistent="true" + android:entryValues="@array/keyboard_layout_modes_values" + android:entries="@array/keyboard_layout_modes" + android:defaultValue="@string/config_default_keyboard_theme_id" /> </PreferenceCategory> - <CheckBoxPreference - android:key="usability_study_mode" - android:title="@string/prefs_usability_study_mode" - android:persistent="true" - android:defaultValue="false" /> - <CheckBoxPreference - android:key="enable_logging" - android:title="@string/prefs_enable_log" - android:summary="@string/prefs_description_log" - android:persistent="true" - android:defaultValue="true" /> - <ListPreference - android:key="pref_keyboard_layout_20100902" - android:title="@string/keyboard_layout" - android:persistent="true" - android:entryValues="@array/keyboard_layout_modes_values" - android:entries="@array/keyboard_layout_modes" - android:defaultValue="@string/config_default_keyboard_theme_id" /> <!-- <Preference android:title="Debug Settings" android:key="debug_settings"> diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_for_debug.xml index 2dad17148..477461df4 100644 --- a/java/res/xml/prefs_for_debug.xml +++ b/java/res/xml/prefs_for_debug.xml @@ -36,6 +36,13 @@ /> <CheckBoxPreference + android:key="use_spacebar_language_switch" + android:title="@string/prefs_use_spacebar_language_switch" + android:persistent="true" + android:defaultValue="false" + /> + + <CheckBoxPreference android:key="debug_mode" android:title="@string/prefs_debug_mode" android:persistent="true" |