diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/donottranslate.xml | 20 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | java/res/xml/prefs.xml | 181 | ||||
| -rw-r--r-- | java/res/xml/prefs_screen_advanced.xml | 52 | ||||
| -rw-r--r-- | java/res/xml/prefs_screen_correction.xml | 76 | ||||
| -rw-r--r-- | java/res/xml/prefs_screen_gesture.xml | 47 | ||||
| -rw-r--r-- | java/res/xml/prefs_screen_input.xml | 53 | ||||
| -rw-r--r-- | java/res/xml/prefs_screen_multi_lingual.xml | 38 |
8 files changed, 276 insertions, 194 deletions
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 83d082f82..e3f0aeade 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -18,26 +18,6 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- Always show the suggestion strip --> - <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">1</string> - <!-- Always hide the suggestion strip --> - <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">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> - <!-- For backward compatibility. See {@link SettingsValues#needsToShowVoiceInputKey(SharedPreferences,Resources)} --> <string name="voice_mode_main">0</string> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 6df69ed47..b6601c8c2 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -108,9 +108,6 @@ <string name="prefs_show_suggestions">Show correction suggestions</string> <!-- Description for show suggestions --> <string name="prefs_show_suggestions_summary">Display suggested words while typing</string> - <string name="prefs_suggestion_visibility_show_name">Always show</string> - <string name="prefs_suggestion_visibility_show_only_portrait_name">Show in portrait mode</string> - <string name="prefs_suggestion_visibility_hide_name">Always hide</string> <!-- Option to block potentially offensive words to be shown [CHAR_LIMIT=30] --> <string name="prefs_block_potentially_offensive_title">Block offensive words</string> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index 6febb3126..66091a03d 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -19,41 +19,9 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" android:key="english_ime_settings"> <PreferenceScreen + android:fragment="com.android.inputmethod.latin.settings.InputSettingsFragment" android:title="@string/settings_screen_input" - android:key="screen_input"> - <CheckBoxPreference - android:key="auto_cap" - android:title="@string/auto_cap" - android:summary="@string/auto_cap_summary" - android:defaultValue="true" - android:persistent="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:defaultValue="true" - android:persistent="true" /> - <CheckBoxPreference - android:key="vibrate_on" - android:title="@string/vibrate_on_keypress" - android:defaultValue="@bool/config_default_vibration_enabled" - android:persistent="true" /> - <CheckBoxPreference - android:key="sound_on" - android:title="@string/sound_on_keypress" - android:defaultValue="@bool/config_default_sound_enabled" - android:persistent="true" /> - <CheckBoxPreference - android:key="popup_on" - android:title="@string/popup_on_keypress" - android:defaultValue="@bool/config_default_key_preview_popup" - android:persistent="true" /> - <CheckBoxPreference - android:key="pref_voice_input_key" - android:title="@string/voice_input" - android:defaultValue="true" - android:persistent="true" /> - </PreferenceScreen> + android:key="screen_input" /> <ListPreference android:key="pref_keyboard_theme" android:title="@string/keyboard_theme" @@ -61,148 +29,19 @@ android:entries="@array/keyboard_theme_names" android:persistent="true" /> <PreferenceScreen + android:fragment="com.android.inputmethod.latin.settings.MultiLingualSettingsFragment" android:title="@string/settings_screen_multi_lingual" - android:key="screen_multi_lingual"> - <CheckBoxPreference - android:key="pref_show_language_switch_key" - android:title="@string/show_language_switch_key" - android:summary="@string/show_language_switch_key_summary" - android:defaultValue="true" - android:persistent="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:defaultValue="false" - android:persistent="true" /> - <PreferenceScreen - android:fragment="com.android.inputmethod.latin.settings.AdditionalSubtypeSettings" - android:key="custom_input_styles" - android:title="@string/custom_input_styles_title" /> - </PreferenceScreen> + android:key="screen_multi_lingual" /> <PreferenceScreen + android:fragment="com.android.inputmethod.latin.settings.GestureSettingsFragment" android:title="@string/settings_screen_gesture" - android:key="screen_gesture"> - <CheckBoxPreference - android:key="gesture_input" - android:title="@string/gesture_input" - android:summary="@string/gesture_input_summary" - android:defaultValue="true" - android:persistent="true" /> - <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:defaultValue="true" - android:persistent="true" /> - <CheckBoxPreference - android:key="pref_gesture_preview_trail" - android:dependency="gesture_input" - android:title="@string/gesture_preview_trail" - android:defaultValue="true" - android:persistent="true" /> - <CheckBoxPreference - android:key="pref_gesture_space_aware" - android:dependency="gesture_input" - android:title="@string/gesture_space_aware" - android:summary="@string/gesture_space_aware_summary" - android:defaultValue="true" - android:persistent="true" /> - </PreferenceScreen> + android:key="screen_gesture" /> <PreferenceScreen + android:fragment="com.android.inputmethod.latin.settings.CorrectionSettingsFragment" android:title="@string/settings_screen_correction" - android:key="screen_correction"> - <PreferenceScreen - android:key="edit_personal_dictionary" - android:title="@string/edit_personal_dictionary"> - <intent android:action="android.settings.USER_DICTIONARY_SETTINGS" /> - </PreferenceScreen> - <PreferenceScreen - android:key="configure_dictionaries_key" - android:title="@string/configure_dictionaries_title"> - <intent - android:action="android.intent.action.MAIN" - android:targetClass="@string/dictionary_pack_settings_activity"> - <extra - android:name="clientId" - android:value="@string/dictionary_pack_client_id" /> - </intent> - </PreferenceScreen> - <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:defaultValue="@bool/config_block_potentially_offensive" - android:persistent="true" /> - <ListPreference - android:key="auto_correction_threshold" - android:title="@string/auto_correction" - android:summary="@string/auto_correction_summary" - android:entryValues="@array/auto_correction_threshold_mode_indexes" - android:entries="@array/auto_correction_threshold_modes" - android:defaultValue="@string/auto_correction_threshold_mode_index_modest" - android:persistent="true" /> - <ListPreference - android:key="show_suggestions_setting" - android:summary="@string/prefs_show_suggestions_summary" - android:title="@string/prefs_show_suggestions" - android:entryValues="@array/prefs_suggestion_visibility_values" - android:entries="@array/prefs_suggestion_visibilities" - android:defaultValue="@string/prefs_suggestion_visibility_default_value" - android:persistent="true" /> - <CheckBoxPreference - android:key="pref_key_use_personalized_dicts" - android:title="@string/use_personalized_dicts" - android:summary="@string/use_personalized_dicts_summary" - android:defaultValue="true" - android:persistent="true" /> - <CheckBoxPreference - android:key="pref_key_use_contacts_dict" - android:title="@string/use_contacts_dict" - android:summary="@string/use_contacts_dict_summary" - android:defaultValue="true" - android:persistent="true" /> - <CheckBoxPreference - android:key="next_word_prediction" - android:title="@string/bigram_prediction" - android:summary="@string/bigram_prediction_summary" - android:defaultValue="true" - android:persistent="true" /> - </PreferenceScreen> + android:key="screen_correction" /> <PreferenceScreen + android:fragment="com.android.inputmethod.latin.settings.AdvancedSettingsFragment" 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. --> - <CheckBoxPreference - android:key="pref_show_setup_wizard_icon" - android:title="@string/show_setup_wizard_icon" - android:summary="@string/show_setup_wizard_icon_summary" /> - <!-- title will be set programmatically to embed application name --> - <CheckBoxPreference - android:key="pref_enable_metrics_logging" - android:summary="@string/enable_metrics_logging_summary" - android:defaultValue="true" - android:persistent="true" /> - <PreferenceScreen - android:fragment="com.android.inputmethod.latin.settings.DebugSettings" - android:key="screen_debug" - android:title="Debug settings" - android:defaultValue="false" - android:persistent="true" /> - </PreferenceScreen> + android:key="screen_advanced" /> </PreferenceScreen> diff --git a/java/res/xml/prefs_screen_advanced.xml b/java/res/xml/prefs_screen_advanced.xml new file mode 100644 index 000000000..5aefcc8d5 --- /dev/null +++ b/java/res/xml/prefs_screen_advanced.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<PreferenceScreen + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + 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 settings 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" /> + <!-- title will be set programmatically to embed application name --> + <CheckBoxPreference + android:key="pref_enable_metrics_logging" + android:summary="@string/enable_metrics_logging_summary" + android:defaultValue="true" + android:persistent="true" /> + <PreferenceScreen + android:fragment="com.android.inputmethod.latin.settings.DebugSettingsFragment" + android:key="screen_debug" + android:title="Debug settings" + android:defaultValue="false" + android:persistent="true" /> +</PreferenceScreen> diff --git a/java/res/xml/prefs_screen_correction.xml b/java/res/xml/prefs_screen_correction.xml new file mode 100644 index 000000000..dd5ba540c --- /dev/null +++ b/java/res/xml/prefs_screen_correction.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<PreferenceScreen + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + android:title="@string/settings_screen_correction" + android:key="screen_correction"> + <PreferenceScreen + android:key="edit_personal_dictionary" + android:title="@string/edit_personal_dictionary"> + <intent android:action="android.settings.USER_DICTIONARY_SETTINGS" /> + </PreferenceScreen> + <PreferenceScreen + android:key="configure_dictionaries_key" + android:title="@string/configure_dictionaries_title"> + <intent + android:action="android.intent.action.MAIN" + android:targetClass="@string/dictionary_pack_settings_activity"> + <extra + android:name="clientId" + android:value="@string/dictionary_pack_client_id" /> + </intent> + </PreferenceScreen> + <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:defaultValue="@bool/config_block_potentially_offensive" + android:persistent="true" /> + <ListPreference + android:key="auto_correction_threshold" + android:title="@string/auto_correction" + android:summary="@string/auto_correction_summary" + android:entryValues="@array/auto_correction_threshold_mode_indexes" + android:entries="@array/auto_correction_threshold_modes" + android:defaultValue="@string/auto_correction_threshold_mode_index_modest" + android:persistent="true" /> + <CheckBoxPreference + android:key="show_suggestions" + android:summary="@string/prefs_show_suggestions_summary" + android:title="@string/prefs_show_suggestions" + android:defaultValue="true" + android:persistent="true" /> + <CheckBoxPreference + android:key="pref_key_use_personalized_dicts" + android:title="@string/use_personalized_dicts" + android:summary="@string/use_personalized_dicts_summary" + android:defaultValue="true" + android:persistent="true" /> + <CheckBoxPreference + android:key="pref_key_use_contacts_dict" + android:title="@string/use_contacts_dict" + android:summary="@string/use_contacts_dict_summary" + android:defaultValue="true" + android:persistent="true" /> + <CheckBoxPreference + android:key="next_word_prediction" + android:title="@string/bigram_prediction" + android:summary="@string/bigram_prediction_summary" + android:defaultValue="true" + android:persistent="true" /> +</PreferenceScreen> diff --git a/java/res/xml/prefs_screen_gesture.xml b/java/res/xml/prefs_screen_gesture.xml new file mode 100644 index 000000000..c87316dfa --- /dev/null +++ b/java/res/xml/prefs_screen_gesture.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<PreferenceScreen + xmlns:android="http://schemas.android.com/apk/res/android" + android:title="@string/settings_screen_gesture" + android:key="screen_gesture"> + <CheckBoxPreference + android:key="gesture_input" + android:title="@string/gesture_input" + android:summary="@string/gesture_input_summary" + android:defaultValue="true" + android:persistent="true" /> + <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:defaultValue="true" + android:persistent="true" /> + <CheckBoxPreference + android:key="pref_gesture_preview_trail" + android:dependency="gesture_input" + android:title="@string/gesture_preview_trail" + android:defaultValue="true" + android:persistent="true" /> + <CheckBoxPreference + android:key="pref_gesture_space_aware" + android:dependency="gesture_input" + android:title="@string/gesture_space_aware" + android:summary="@string/gesture_space_aware_summary" + android:defaultValue="true" + android:persistent="true" /> +</PreferenceScreen> diff --git a/java/res/xml/prefs_screen_input.xml b/java/res/xml/prefs_screen_input.xml new file mode 100644 index 000000000..7704e3f80 --- /dev/null +++ b/java/res/xml/prefs_screen_input.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<PreferenceScreen + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + android:title="@string/settings_screen_input"> + <CheckBoxPreference + android:key="auto_cap" + android:title="@string/auto_cap" + android:summary="@string/auto_cap_summary" + android:defaultValue="true" + android:persistent="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:defaultValue="true" + android:persistent="true" /> + <CheckBoxPreference + android:key="vibrate_on" + android:title="@string/vibrate_on_keypress" + android:defaultValue="@bool/config_default_vibration_enabled" + android:persistent="true" /> + <CheckBoxPreference + android:key="sound_on" + android:title="@string/sound_on_keypress" + android:defaultValue="@bool/config_default_sound_enabled" + android:persistent="true" /> + <CheckBoxPreference + android:key="popup_on" + android:title="@string/popup_on_keypress" + android:defaultValue="@bool/config_default_key_preview_popup" + android:persistent="true" /> + <CheckBoxPreference + android:key="pref_voice_input_key" + android:title="@string/voice_input" + android:defaultValue="true" + android:persistent="true" /> +</PreferenceScreen> diff --git a/java/res/xml/prefs_screen_multi_lingual.xml b/java/res/xml/prefs_screen_multi_lingual.xml new file mode 100644 index 000000000..937d439d6 --- /dev/null +++ b/java/res/xml/prefs_screen_multi_lingual.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<PreferenceScreen + xmlns:android="http://schemas.android.com/apk/res/android" + android:title="@string/settings_screen_multi_lingual" + android:key="screen_multi_lingual"> + <CheckBoxPreference + android:key="pref_show_language_switch_key" + android:title="@string/show_language_switch_key" + android:summary="@string/show_language_switch_key_summary" + android:defaultValue="true" + android:persistent="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:defaultValue="false" + android:persistent="true" /> + <PreferenceScreen + android:fragment="com.android.inputmethod.latin.settings.CustomInputStyleSettingsFragment" + android:key="custom_input_styles" + android:title="@string/custom_input_styles_title" /> +</PreferenceScreen> |