diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-10 14:59:46 -0700 |
---|---|---|
committer | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-10 15:05:51 -0700 |
commit | e6b336d1a05752b546319a33a5f5b5c65bccf4e9 (patch) | |
tree | 9f96456cfeeb75c37e466c0a387975c7f047db59 /res | |
parent | 957ccf30b9c969a6362fccb293d2c2df8bd1ad32 (diff) | |
download | packages_apps_Settings-e6b336d1a05752b546319a33a5f5b5c65bccf4e9.zip packages_apps_Settings-e6b336d1a05752b546319a33a5f5b5c65bccf4e9.tar.gz packages_apps_Settings-e6b336d1a05752b546319a33a5f5b5c65bccf4e9.tar.bz2 |
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
Diffstat (limited to 'res')
-rw-r--r-- | res/values/strings.xml | 26 | ||||
-rw-r--r-- | res/xml/account_settings.xml | 4 | ||||
-rw-r--r-- | res/xml/date_time_prefs.xml | 12 | ||||
-rw-r--r-- | res/xml/device_info_memory.xml | 4 | ||||
-rw-r--r-- | res/xml/display_settings.xml | 8 | ||||
-rw-r--r-- | res/xml/language_settings.xml | 85 | ||||
-rw-r--r-- | res/xml/location_settings.xml | 7 | ||||
-rw-r--r-- | res/xml/notification_settings.xml | 4 | ||||
-rw-r--r-- | res/xml/power_usage_summary.xml | 2 | ||||
-rw-r--r-- | res/xml/print_settings.xml | 5 | ||||
-rw-r--r-- | res/xml/privacy_settings.xml | 8 | ||||
-rw-r--r-- | res/xml/wireless_settings.xml | 6 |
12 files changed, 137 insertions, 34 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index e34facb..8c3a19f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5130,8 +5130,32 @@ <!-- Text used to identify the search results --> <string name="search_results_label">Results</string> - <!--Search Keywords--> + <!--Search Keywords [CHAR_LIMIT=NONE]--> <string name="keywords_wifi">wifi wi-fi network connection</string> + <string name="keywords_more_default_sms_app">text message</string> + <string name="keywords_more_mobile_networks">cellular cell carrier wireless</string> + <string name="keywords_display">screen touchscreen</string> + <string name="keywords_display_brightness_level">dim screen touchscreen</string> + <string name="keywords_display_auto_brightness">dim screen touchscreen</string> + <string name="keywords_display_wallpaper">background</string> + <string name="keywords_display_font_size">text size</string> + <string name="keywords_display_cast_screen">project</string> + <string name="keywords_storage">space disk hard drive</string> + <string name="keywords_battery">power</string> + <string name="keywords_spell_checker">spelling</string> + <string name="keywords_text_to_speech_output">rate language default speak speaking</string> + <string name="keywords_date_and_time">clock</string> + <string name="keywords_factory_data_reset">wipe delete</string> + <string name="keywords_printing">printer</string> + <string name="keywords_sounds_and_notifications">speaker beep</string> + <string name="keywords_sounds_and_notifications_interruptions">dont don\'t disturb interrupt interruption break</string> + <string name="keywords_app">RAM</string> + <string name="keywords_location">nearby location history reporting</string> + <string name="keywords_location_mode">accuracy</string> + <string name="keywords_accounts">account</string> + <string name="keywords_users">restriction restrict restricted</string> + <string name="keywords_keyboard_and_ime">text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji</string> + <string name="keywords_search_voice">language hands-free hand free recognition offensive word audio history bluetooth headset</string> <!-- NFC Wi-Fi pairing/setup strings--> diff --git a/res/xml/account_settings.xml b/res/xml/account_settings.xml index 236a26d..7437b80 100644 --- a/res/xml/account_settings.xml +++ b/res/xml/account_settings.xml @@ -15,8 +15,10 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" android:key="account" - android:title="@string/account_settings_title"> + android:title="@string/account_settings_title" + settings:keywords="@string/keywords_accounts"> <Preference android:key="add_account" diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml index 1e7ac58..5bf3c9a 100644 --- a/res/xml/date_time_prefs.xml +++ b/res/xml/date_time_prefs.xml @@ -15,36 +15,46 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - android:title="@string/date_and_time"> + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" + android:title="@string/date_and_time" + settings:keywords="@string/keywords_date_and_time"> + <CheckBoxPreference android:key="auto_time" android:title="@string/date_time_auto" android:summaryOn="@string/date_time_auto_summaryOn" android:summaryOff="@string/date_time_auto_summaryOff" /> + <CheckBoxPreference android:key="auto_zone" android:title="@string/zone_auto" android:summaryOn="@string/zone_auto_summaryOn" android:summaryOff="@string/zone_auto_summaryOff" /> + <Preference android:key="date" android:title="@string/date_time_set_date" android:summary="03/10/2008" /> + <Preference android:key="time" android:title="@string/date_time_set_time" android:summary="12:00am" /> + <PreferenceScreen android:fragment="com.android.settings.ZonePicker" android:key="timezone" android:title="@string/date_time_set_timezone" android:summary="GMT-8:00" /> + <CheckBoxPreference android:key="24 hour" android:title="@string/date_time_24hour" /> + <ListPreference android:key="date_format" android:title="@string/date_time_date_format" android:summary="mm/dd/yyyy"/> + </PreferenceScreen> diff --git a/res/xml/device_info_memory.xml b/res/xml/device_info_memory.xml index e4ea1cc..38cc94a 100644 --- a/res/xml/device_info_memory.xml +++ b/res/xml/device_info_memory.xml @@ -15,7 +15,9 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - android:title="@string/storage_settings"> + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" + android:title="@string/storage_settings" + settings:keywords="@string/keywords_storage"> <!-- Preference categories are dynamically created based on the list of available storage volumes --> diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index 4a8211f..3c4f4af 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -15,23 +15,27 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" android:title="@string/display_settings" - xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> + settings:keywords="@string/keywords_display"> <com.android.settings.BrightnessPreference android:key="brightness" android:title="@string/brightness" + settings:keywords="@string/keywords_display_brightness_level" android:persistent="false"/> <CheckBoxPreference android:key="auto_brightness" android:title="@string/auto_brightness_title" + settings:keywords="@string/keywords_display_auto_brightness" android:summary="@string/auto_brightness_summary" android:persistent="false" /> <PreferenceScreen android:key="wallpaper" android:title="@string/wallpaper_settings_title" + settings:keywords="@string/keywords_display_wallpaper" android:fragment="com.android.settings.WallpaperTypeSettings" /> <ListPreference @@ -50,6 +54,7 @@ <com.android.settings.WarnedListPreference android:key="font_size" android:title="@string/title_font_size" + settings:keywords="@string/keywords_display_font_size" android:summary="@string/summary_font_size" android:entries="@array/entries_font_size" android:entryValues="@array/entryvalues_font_size" @@ -58,6 +63,7 @@ <PreferenceScreen android:key="wifi_display" android:title="@string/wifi_display_settings_title" + settings:keywords="@string/keywords_display_cast_screen" android:fragment="com.android.settings.wfd.WifiDisplaySettings" /> </PreferenceScreen> 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> diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml index 83b80b1..994ddf1 100644 --- a/res/xml/location_settings.xml +++ b/res/xml/location_settings.xml @@ -15,10 +15,15 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - android:title="@string/location_settings_title"> + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" + android:key="location_settings" + android:title="@string/location_settings_title" + settings:keywords="@string/keywords_location"> + <Preference android:key="location_mode" android:title="@string/location_mode_title" + settings:keywords="@string/keywords_location_mode" android:summary="@string/location_mode_location_off_title" /> <PreferenceCategory diff --git a/res/xml/notification_settings.xml b/res/xml/notification_settings.xml index af9ab6c..f077e85 100644 --- a/res/xml/notification_settings.xml +++ b/res/xml/notification_settings.xml @@ -15,9 +15,10 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" android:title="@string/notification_settings" android:key="notification_settings" - xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> + settings:keywords="@string/keywords_sounds_and_notifications"> <PreferenceCategory android:key="sound" @@ -57,6 +58,7 @@ <PreferenceScreen android:key="zen_mode" android:title="@string/zen_mode_settings_title" + settings:keywords="@string/keywords_sounds_and_notifications_interruptions" android:fragment="com.android.settings.notification.ZenModeSettings" /> <!-- Phone ringtone --> diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml index 44e40bd..0622513 100644 --- a/res/xml/power_usage_summary.xml +++ b/res/xml/power_usage_summary.xml @@ -15,6 +15,8 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" android:title="@string/power_usage_summary_title" + settings:keywords="@string/keywords_battery" android:key="app_list"> </PreferenceScreen> diff --git a/res/xml/print_settings.xml b/res/xml/print_settings.xml index 8a29563..3a00f71 100644 --- a/res/xml/print_settings.xml +++ b/res/xml/print_settings.xml @@ -15,8 +15,9 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" - android:title="@string/print_settings_title"> + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" + android:title="@string/print_settings_title" + settings:keywords="@string/keywords_printing"> <PreferenceCategory android:key="print_jobs_category" diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml index 20aa68e..99fdc3f 100644 --- a/res/xml/privacy_settings.xml +++ b/res/xml/privacy_settings.xml @@ -15,16 +15,19 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" android:title="@string/privacy_settings_title"> <PreferenceCategory android:key="backup_category" android:title="@string/backup_section_title"> + <!-- Backup settings --> <CheckBoxPreference android:key="backup_data" android:title="@string/backup_data_title" android:summary="@string/backup_data_summary" android:persistent="false" /> + <PreferenceScreen android:key="configure_account" android:title="@string/backup_configure_account_title" @@ -33,20 +36,25 @@ <!-- the Intent declared here is always overwritten by a real one --> <intent android:action="dummy" /> </PreferenceScreen> + <CheckBoxPreference android:key="auto_restore" android:title="@string/auto_restore_title" android:summary="@string/auto_restore_summary" android:persistent="false" /> + </PreferenceCategory> <PreferenceCategory android:key="personal_data_category" android:title="@string/personal_data_section_title"> + <!-- Factory reset --> <PreferenceScreen android:title="@string/master_clear_title" android:summary="@string/master_clear_summary" + settings:keywords="@string/keywords_factory_data_reset" android:fragment="com.android.settings.MasterClear" /> + </PreferenceCategory> </PreferenceScreen> diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index bf1523e..ac5a7be 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -15,7 +15,9 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - android:title="@string/radio_controls_title"> + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" + android:title="wireless_settings" + android:key="@string/radio_controls_title"> <CheckBoxPreference android:key="toggle_airplane" @@ -26,6 +28,7 @@ <com.android.settings.AppListPreference android:key="sms_application" android:title="@string/sms_application_title" + settings:keywords="@string/keywords_more_default_sms_app" android:summary="%s" android:persistent="false" /> @@ -53,6 +56,7 @@ <PreferenceScreen android:key="mobile_network_settings" android:title="@string/network_settings_title" + settings:keywords="@string/keywords_more_mobile_networks" android:dependency="toggle_airplane"> <intent android:action="android.intent.action.MAIN" |