diff options
Diffstat (limited to 'java/res/xml')
| -rw-r--r-- | java/res/xml/prefs.xml | 259 | ||||
| -rw-r--r-- | java/res/xml/prefs_for_debug.xml | 12 | ||||
| -rw-r--r-- | java/res/xml/spell_checker_settings.xml | 17 |
3 files changed, 126 insertions, 162 deletions
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index cb951d264..0e9c16190 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -18,117 +18,39 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" android:key="english_ime_settings"> - <PreferenceScreen - android:title="@string/settings_screen_input" - android:key="screen_input"> - <SwitchPreference + <PreferenceCategory + android:title="@string/general_category" + android:key="general_settings"> + <CheckBoxPreference android:key="auto_cap" android:title="@string/auto_cap" android:summary="@string/auto_cap_summary" - android:switchTextOn="" - android:switchTextOff="" android:persistent="true" android:defaultValue="true" /> - <SwitchPreference - android:key="pref_key_use_double_space_period" - android:title="@string/use_double_space_period" - android:summary="@string/use_double_space_period_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> - <SwitchPreference + <CheckBoxPreference android:key="vibrate_on" android:title="@string/vibrate_on_keypress" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="@bool/config_default_vibration_enabled" /> - <SwitchPreference + android:defaultValue="@bool/config_default_vibration_enabled" + android:persistent="true" /> + <CheckBoxPreference android:key="sound_on" android:title="@string/sound_on_keypress" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="@bool/config_default_sound_enabled" /> - <SwitchPreference + android:defaultValue="@bool/config_default_sound_enabled" + android:persistent="true" /> + <CheckBoxPreference android:key="popup_on" android:title="@string/popup_on_keypress" - android:switchTextOn="" - android:switchTextOff="" android:persistent="true" android:defaultValue="@bool/config_default_key_preview_popup" /> - <SwitchPreference + <CheckBoxPreference android:key="pref_voice_input_key" android:title="@string/voice_input" - android:switchTextOn="" - android:switchTextOff="" android:persistent="true" android:defaultValue="true" /> - </PreferenceScreen> - <ListPreference - android:key="pref_keyboard_theme" - android:title="@string/keyboard_theme" - android:persistent="true" - android:entryValues="@array/keyboard_theme_ids" - android:entries="@array/keyboard_theme_names" /> - <PreferenceScreen - android:title="@string/settings_screen_multi_lingual" - android:key="screen_multi_lingual"> - <SwitchPreference - android:key="pref_show_language_switch_key" - android:title="@string/show_language_switch_key" - android:summary="@string/show_language_switch_key_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> - <SwitchPreference - android:key="pref_include_other_imes_in_language_switch_list" - android:dependency="pref_show_language_switch_key" - android:title="@string/include_other_imes_in_language_switch_list" - android:summary="@string/include_other_imes_in_language_switch_list_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="false" /> - <PreferenceScreen - android:fragment="com.android.inputmethod.latin.settings.AdditionalSubtypeSettings" - android:key="custom_input_styles" - android:title="@string/custom_input_styles_title" /> - </PreferenceScreen> - <PreferenceScreen - android:title="@string/settings_screen_gesture" - android:key="screen_gesture"> - <SwitchPreference - android:key="gesture_input" - android:title="@string/gesture_input" - android:summary="@string/gesture_input_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> - <SwitchPreference - android:key="pref_gesture_floating_preview_text" - android:dependency="gesture_input" - android:title="@string/gesture_floating_preview_text" - android:summary="@string/gesture_floating_preview_text_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> - <SwitchPreference - android:key="pref_gesture_preview_trail" - android:dependency="gesture_input" - android:title="@string/gesture_preview_trail" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> - </PreferenceScreen> - <PreferenceScreen - android:title="@string/settings_screen_correction" - android:key="screen_correction"> + </PreferenceCategory> + <PreferenceCategory + android:title="@string/correction_category" + android:key="correction_settings"> <PreferenceScreen android:key="edit_personal_dictionary" android:title="@string/edit_personal_dictionary"> @@ -145,12 +67,10 @@ android:value="@string/dictionary_pack_client_id" /> </intent> </PreferenceScreen> - <SwitchPreference + <CheckBoxPreference android:key="pref_key_block_potentially_offensive" android:title="@string/prefs_block_potentially_offensive_title" android:summary="@string/prefs_block_potentially_offensive_summary" - android:switchTextOn="" - android:switchTextOff="" android:persistent="true" android:defaultValue="@bool/config_block_potentially_offensive" /> <ListPreference @@ -169,66 +89,119 @@ android:entryValues="@array/prefs_suggestion_visibility_values" android:entries="@array/prefs_suggestion_visibilities" android:defaultValue="@string/prefs_suggestion_visibility_default_value" /> - <SwitchPreference + <CheckBoxPreference android:key="pref_key_use_personalized_dicts" android:title="@string/use_personalized_dicts" android:summary="@string/use_personalized_dicts_summary" - android:switchTextOn="" - android:switchTextOff="" android:persistent="true" android:defaultValue="true" /> - <SwitchPreference - android:key="pref_key_use_contacts_dict" - android:title="@string/use_contacts_dict" - android:summary="@string/use_contacts_dict_summary" - android:switchTextOn="" - android:switchTextOff="" + <!-- title will be set programmatically to embed application name --> + <CheckBoxPreference + android:key="pref_enable_metrics_logging" + android:summary="@string/enable_metrics_logging_summary" + android:persistent="true" + android:defaultValue="true" /> + </PreferenceCategory> + <PreferenceCategory + android:title="@string/gesture_typing_category" + android:key="gesture_typing_settings"> + <CheckBoxPreference + android:key="gesture_input" + android:title="@string/gesture_input" + android:summary="@string/gesture_input_summary" + android:persistent="true" + android:defaultValue="true" /> + <!-- TODO: Move these two options to the advanced settings. --> + <CheckBoxPreference + android:key="pref_gesture_floating_preview_text" + android:dependency="gesture_input" + android:title="@string/gesture_floating_preview_text" + android:summary="@string/gesture_floating_preview_text_summary" android:persistent="true" android:defaultValue="true" /> - <SwitchPreference + <CheckBoxPreference + android:key="pref_gesture_preview_trail" + android:dependency="gesture_input" + android:title="@string/gesture_preview_trail" + android:persistent="true" + android:defaultValue="true" /> + </PreferenceCategory> + <PreferenceCategory + android:title="@string/misc_category" + android:key="misc_settings"> + <CheckBoxPreference android:key="next_word_prediction" android:title="@string/bigram_prediction" android:summary="@string/bigram_prediction_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> - </PreferenceScreen> - <PreferenceScreen - android:title="@string/settings_screen_advanced" - android:key="screen_advanced"> - <!-- TODO: consolidate key preview dismiss delay with the key preview animation parameters. --> - <ListPreference - android:key="pref_key_preview_popup_dismiss_delay" - android:title="@string/key_preview_popup_dismiss_delay" /> - <com.android.inputmethod.latin.settings.SeekBarDialogPreference - android:key="pref_vibration_duration_settings" - android:title="@string/prefs_keypress_vibration_duration_settings" - latin:maxValue="@integer/config_max_vibration_duration" /> - <com.android.inputmethod.latin.settings.SeekBarDialogPreference - android:key="pref_keypress_sound_volume" - android:title="@string/prefs_keypress_sound_volume_settings" - latin:maxValue="100" /> <!-- percent --> - <!-- The settigs for showing setup wizard application icon shouldn't be persistent and - the default value is added programmatically. --> - <SwitchPreference - android:key="pref_show_setup_wizard_icon" - android:title="@string/show_setup_wizard_icon" - android:summary="@string/show_setup_wizard_icon_summary" - android:switchTextOn="" - android:switchTextOff="" /> - <!-- title will be set programmatically to embed application name --> - <SwitchPreference - android:key="pref_enable_metrics_logging" - android:summary="@string/enable_metrics_logging_summary" - android:switchTextOn="" - android:switchTextOff="" android:persistent="true" android:defaultValue="true" /> <PreferenceScreen - android:key="screen_debug" + android:key="pref_advanced_settings" + android:title="@string/advanced_settings" + android:summary="@string/advanced_settings_summary"> + <CheckBoxPreference + android:key="pref_key_use_contacts_dict" + android:title="@string/use_contacts_dict" + android:summary="@string/use_contacts_dict_summary" + android:persistent="true" + android:defaultValue="true" /> + <CheckBoxPreference + android:key="pref_key_use_double_space_period" + android:title="@string/use_double_space_period" + android:summary="@string/use_double_space_period_summary" + android:persistent="true" + android:defaultValue="true" /> + <CheckBoxPreference + android:key="pref_show_language_switch_key" + android:title="@string/show_language_switch_key" + android:summary="@string/show_language_switch_key_summary" + android:persistent="true" + android:defaultValue="true" /> + <CheckBoxPreference + android:key="pref_include_other_imes_in_language_switch_list" + android:dependency="pref_show_language_switch_key" + android:title="@string/include_other_imes_in_language_switch_list" + android:summary="@string/include_other_imes_in_language_switch_list_summary" + android:persistent="true" + android:defaultValue="false" /> + <ListPreference + android:key="pref_keyboard_theme" + android:title="@string/keyboard_color_scheme" + android:persistent="true" + android:entryValues="@array/keyboard_theme_ids" + android:entries="@array/keyboard_theme_names" /> + <PreferenceScreen + android:fragment="com.android.inputmethod.latin.settings.AdditionalSubtypeSettings" + android:key="custom_input_styles" + android:title="@string/custom_input_styles_title" /> + <!-- TODO: consolidate key preview dismiss delay with the key preview animation parameters. --> + <ListPreference + android:key="pref_key_preview_popup_dismiss_delay" + android:title="@string/key_preview_popup_dismiss_delay" /> + <com.android.inputmethod.latin.settings.SeekBarDialogPreference + android:key="pref_vibration_duration_settings" + android:title="@string/prefs_keypress_vibration_duration_settings" + latin:maxValue="@integer/config_max_vibration_duration" /> + <com.android.inputmethod.latin.settings.SeekBarDialogPreference + android:key="pref_keypress_sound_volume" + android:title="@string/prefs_keypress_sound_volume_settings" + latin:maxValue="100" /> <!-- percent --> + <!-- The settigs for showing setup wizard application icon shouldn't be persistent and + the default value is added programmatically. --> + <CheckBoxPreference + android:key="pref_show_setup_wizard_icon" + android:title="@string/show_setup_wizard_icon" + android:summary="@string/show_setup_wizard_icon_summary" /> + </PreferenceScreen> + <PreferenceScreen + android:key="send_feedback" + android:title="@string/send_feedback" /> + <PreferenceScreen + android:key="about_keyboard" /> + <PreferenceScreen + android:key="debug_settings" android:title="Debug settings" android:persistent="true" android:defaultValue="false" /> - </PreferenceScreen> + </PreferenceCategory> </PreferenceScreen> diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_for_debug.xml index be4c8b3e1..0bcc5cbe4 100644 --- a/java/res/xml/prefs_for_debug.xml +++ b/java/res/xml/prefs_for_debug.xml @@ -20,26 +20,20 @@ android:title="@string/prefs_debug_mode" android:key="english_ime_debug_settings" > - <SwitchPreference + <CheckBoxPreference android:key="debug_mode" android:title="@string/prefs_debug_mode" - android:switchTextOn="" - android:switchTextOff="" android:persistent="true" android:defaultValue="false" /> - <SwitchPreference + <CheckBoxPreference android:key="force_non_distinct_multitouch" android:title="@string/prefs_force_non_distinct_multitouch" - android:switchTextOn="" - android:switchTextOff="" android:persistent="true" android:defaultValue="false" /> - <SwitchPreference + <CheckBoxPreference android:key="pref_sliding_key_input_preview" android:title="@string/sliding_key_input_preview" android:summary="@string/sliding_key_input_preview_summary" - android:switchTextOn="" - android:switchTextOff="" android:persistent="true" android:defaultValue="true" /> <com.android.inputmethod.latin.settings.SeekBarDialogPreference diff --git a/java/res/xml/spell_checker_settings.xml b/java/res/xml/spell_checker_settings.xml index e3db4850b..de67e7f81 100644 --- a/java/res/xml/spell_checker_settings.xml +++ b/java/res/xml/spell_checker_settings.xml @@ -15,14 +15,11 @@ --> <PreferenceScreen - xmlns:android="http://schemas.android.com/apk/res/android" -> - <SwitchPreference - android:key="pref_spellcheck_use_contacts" - android:title="@string/use_contacts_for_spellchecking_option_title" - android:summary="@string/use_contacts_for_spellchecking_option_summary" - android:switchTextOn="" - android:switchTextOff="" - android:persistent="true" - android:defaultValue="true" /> + xmlns:android="http://schemas.android.com/apk/res/android"> + <CheckBoxPreference + android:key="pref_spellcheck_use_contacts" + android:title="@string/use_contacts_for_spellchecking_option_title" + android:summary="@string/use_contacts_for_spellchecking_option_summary" + android:persistent="true" + android:defaultValue="true" /> </PreferenceScreen> |