Merge "Add keywords for search terms" into pi-dev

res/xml/accessibility_vibration_settings.xml

@@ -17,6 +17,7 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="accessibility_settings_vibration_screen"
     android:title="@string/accessibility_vibration_settings_title">
 
@@ -24,11 +25,13 @@
         android:fragment="com.android.settings.accessibility.NotificationVibrationPreferenceFragment"
         android:key="notification_vibration_preference_screen"
         android:title="@string/accessibility_notification_vibration_title"
+        settings:keywords="@string/keywords_ring_vibration"
         app:controller="com.android.settings.accessibility.NotificationVibrationIntensityPreferenceController" />
 
     <Preference
         android:fragment="com.android.settings.accessibility.TouchVibrationPreferenceFragment"
         android:key="touch_vibration_preference_screen"
         android:title="@string/accessibility_touch_vibration_title"
+        settings:keywords="@string/keywords_touch_vibration"
         app:controller="com.android.settings.accessibility.HapticFeedbackIntensityPreferenceController" />
 </PreferenceScreen>

res/xml/app_default_settings.xml

@@ -24,12 +24,14 @@
     <com.android.settings.widget.AppPreference
         android:key="assist_and_voice_input"
         android:title="@string/assist_and_voice_input_title"
-        android:fragment="com.android.settings.applications.assist.ManageAssist" />
+        android:fragment="com.android.settings.applications.assist.ManageAssist"
+        settings:keywords="@string/keywords_assist_input"/>
 
     <com.android.settings.widget.AppPreference
         android:key="default_browser"
         android:title="@string/default_browser_title"
-        android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker">
+        android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker"
+        settings:keywords="@string/keywords_default_browser">
         <extra android:name="for_work" android:value="false" />
     </com.android.settings.widget.AppPreference>
 
@@ -55,7 +57,8 @@
         android:key="default_payment_app"
         android:title="@string/nfc_payment_settings_title"
         android:summary="@string/summary_placeholder"
-        android:fragment="com.android.settings.nfc.PaymentSettings" />
+        android:fragment="com.android.settings.nfc.PaymentSettings"
+        settings:keywords="@string/keywords_default_payment_app"/>
 
     <com.android.settings.widget.AppPreference
         android:key="default_emergency_app"
@@ -73,7 +76,8 @@
     <com.android.settings.widget.AppPreference
         android:key="domain_urls"
         android:title="@string/domain_urls_title"
-        android:fragment="com.android.settings.applications.ManageDomainUrls" />
+        android:fragment="com.android.settings.applications.ManageDomainUrls"
+        settings:keywords="@string/keywords_default_links"/>
 
     <com.android.settings.widget.WorkOnlyCategory
         android:key="work_app_defaults"

res/xml/display_settings.xml

@@ -65,11 +65,13 @@
         android:title="@string/screen_timeout"
         android:summary="@string/summary_placeholder"
         android:entries="@array/screen_timeout_entries"
-        android:entryValues="@array/screen_timeout_values" />
+        android:entryValues="@array/screen_timeout_values"
+        settings:keywords="@string/keywords_screen_timeout"/>
 
     <SwitchPreference
         android:key="auto_rotate"
-        android:title="@string/accelerometer_title" />
+        android:title="@string/accelerometer_title"
+        settings:keywords="@string/keywords_auto_rotate"/>
 
     <Preference
         android:key="color_mode"
@@ -99,7 +101,6 @@
         android:title="@string/screensaver_settings_title"
         android:fragment="com.android.settings.dream.DreamSettings" />
 
-    <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
     <com.android.settingslib.RestrictedPreference
         android:key="ambient_display"
         android:title="@string/ambient_display_screen_title"

res/xml/network_and_internet.xml

@@ -55,6 +55,7 @@
         android:icon="@drawable/ic_wifi_tethering"
         android:order="-5"
         android:summary="@string/summary_placeholder"
+        settings:keywords="@string/keywords_hotspot_tethering"
         settings:userRestriction="no_config_tethering"
         settings:useAdminDisabledSummary="true" />
 

res/xml/night_display_settings.xml

@@ -16,8 +16,10 @@
 
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/night_display_title"
-        android:key="night_display_title">
+        android:key="night_display_title"
+        settings:keywords="@string/keywords_display_night_display">
 
     <DropDownPreference
             android:key="night_display_auto_mode"

res/xml/system_dashboard_fragment.xml

@@ -56,6 +56,7 @@
         android:summary="@string/summary_placeholder"
         android:icon="@drawable/ic_system_update"
         android:order="-30"
+        settings:keywords="@string/keywords_system_update_settings"
         settings:controller="com.android.settings.system.SystemUpdatePreferenceController">
         <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
     </Preference>

res/xml/zen_mode_settings.xml

@@ -15,9 +15,12 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="zen_mode_settings"
-    android:title="@string/zen_mode_settings_title">
+    android:title="@string/zen_mode_settings_title"
+    settings:keywords="@string/keywords_zen_mode_settings">
 
     <!-- What to block (effects) -->
     <Preference