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 | 44 | ||||
| -rw-r--r-- | java/res/xml/prefs_screen_input.xml | 53 |
4 files changed, 58 insertions, 62 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..749551c2a 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" @@ -144,13 +112,11 @@ 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" + <CheckBoxPreference + android:key="show_suggestions" 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:defaultValue="true" android:persistent="true" /> <CheckBoxPreference android:key="pref_key_use_personalized_dicts" 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> |