FR #14318673 Search - add synonyms
- add synonyms to be indexed at the same time as titles and sub-titles
- fix Wi-Fi keywords
Change-Id: I1cb026775592c29c2b813153574c6695e3e90f31
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index d8e7603..35926a0 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -15,33 +15,43 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:key="language_keyboard_settings"
android:title="@string/language_keyboard_settings_title">
<PreferenceScreen
- android:fragment="com.android.settings.LocalePicker"
android:key="phone_language"
- android:title="@string/phone_language"/>
+ android:title="@string/phone_language"
+ android:fragment="com.android.settings.LocalePicker"
+ />
<com.android.settings.inputmethod.SpellCheckersPreference
android:key="spellcheckers_settings"
- android:title="@string/spellcheckers_settings_title"/>
+ android:title="@string/spellcheckers_settings_title"
+ settings:keywords="@string/keywords_spell_checker"
+ />
<!-- User dictionary preference title and fragment will be set programmatically. -->
<PreferenceScreen
android:key="key_user_dictionary_settings"
- android:title="@string/user_dict_settings_title" />
+ android:title="@string/user_dict_settings_title"
+ />
<PreferenceCategory
android:key="keyboard_settings_category"
- android:title="@string/keyboard_settings_category">
+ android:title="@string/keyboard_settings_category"
+ settings:keywords="@string/keywords_keyboard_and_ime">
+
<!-- An intent for this preference will be populated programmatically. -->
<PreferenceScreen
android:key="choose_input_methods"
- android:title="@string/choose_input_methods" />
+ android:title="@string/choose_input_methods"
+ />
+
<PreferenceScreen
android:key="current_input_method"
- android:title="@string/current_input_method" />
+ android:title="@string/current_input_method"
+ />
<!-- Enabled input method list will be populated programmatically here. -->
</PreferenceCategory>
@@ -58,66 +68,93 @@
android:summaryOn="@string/auto_replace_summary"
android:summaryOff="@string/auto_replace_summary"
android:order="1000"
- android:persistent="false"/>
+ android:persistent="false"
+ />
+
<CheckBoxPreference
android:key="auto_caps"
android:title="@string/auto_caps"
android:summaryOn="@string/auto_caps_summary"
android:summaryOff="@string/auto_caps_summary"
android:order="1001"
- android:persistent="false"/>
+ android:persistent="false"
+ />
+
<CheckBoxPreference
android:key="auto_punctuate"
android:title="@string/auto_punctuate"
android:summaryOn="@string/auto_punctuate_summary"
android:summaryOff="@string/auto_punctuate_summary"
android:order="1002"
- android:persistent="false"/>
+ android:persistent="false"
+ />
+
</PreferenceCategory>
- <PreferenceCategory android:key="voice_category"
+ <PreferenceCategory
+ android:key="voice_category"
android:title="@string/voice_category" >
<!-- entries, entryValues, and defaultValue will be populated programmatically. -->
<ListPreference
android:key="voice_interactor"
android:title="@string/voice_interactor_title"
- android:dialogTitle="@string/voice_interactor_title" />
+ android:dialogTitle="@string/voice_interactor_title"
+ />
<!-- An intent for this preference will be populated programmatically. -->
- <PreferenceScreen android:key="voice_interactor_settings"
- android:title="@string/voice_interactor_settings_title" />
+ <PreferenceScreen
+ android:key="voice_interactor_settings"
+ android:title="@string/voice_interactor_settings_title"
+ />
<!-- entries, entryValues, and defaultValue will be populated programmatically. -->
<ListPreference
android:key="recognizer"
android:title="@string/recognizer_title"
- android:dialogTitle="@string/recognizer_title" />
+ android:dialogTitle="@string/recognizer_title"
+ />
<!-- An intent for this preference will be populated programmatically. -->
- <PreferenceScreen android:key="recognizer_settings"
- android:title="@string/recognizer_settings_title" />
+ <PreferenceScreen
+ android:key="recognizer_settings"
+ android:title="@string/recognizer_settings_title"
+ settings:keywords="@string/keywords_search_voice"
+ />
- <PreferenceScreen android:key="tts_settings"
+ <PreferenceScreen
+ android:key="tts_settings"
+ android:title="@string/tts_settings_title"
+ settings:keywords="@string/keywords_text_to_speech_output"
android:fragment="com.android.settings.tts.TextToSpeechSettings"
- android:title="@string/tts_settings_title" />
+ />
+
</PreferenceCategory>
- <PreferenceCategory android:key="pointer_settings_category"
+ <PreferenceCategory
+ android:key="pointer_settings_category"
android:title="@string/pointer_settings_category">
+
<com.android.settings.PointerSpeedPreference
android:key="pointer_speed"
android:title="@string/pointer_speed"
- android:dialogTitle="@string/pointer_speed" />
+ android:dialogTitle="@string/pointer_speed"
+ />
+
</PreferenceCategory>
- <PreferenceCategory android:key="game_controller_settings_category"
+ <PreferenceCategory
+ android:key="game_controller_settings_category"
android:title="@string/game_controller_settings_category">
+
<CheckBoxPreference
android:key="vibrate_input_devices"
android:title="@string/vibrate_input_devices"
android:summaryOn="@string/vibrate_input_devices_summary"
android:summaryOff="@string/vibrate_input_devices_summary"
- android:persistent="false"/>
+ android:persistent="false"
+ />
+
</PreferenceCategory>
+
</PreferenceScreen>