Merge "Update search keywords for some pages."

2019-03-26 18:49:32 +00:00
parent a95e2165a9 bb679d4817
commit 73f570febc
10 changed files with 43 additions and 14 deletions
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2620,8 +2620,6 @@
    <string name="sound_effects_enable_title">Tap sounds</string>
    <!-- Sound settings screen, setting check box label -->
    <string name="lock_sounds_enable_title">Screen lock sound</string>
-    <!-- Sound settings screen, setting check box label -->
-    <string name="haptic_feedback_enable_title">Vibrate on tap</string>
    <!-- Sound settings screen, setting option name checkbox to enable/disable audio recording features that improve audio recording in noisy environments -->
    <string name="audio_record_proc_title">Noise cancellation</string>
    <!-- Volume description for media volume -->
@@ -7124,6 +7122,24 @@

    <!--Search Keywords [CHAR LIMIT=NONE]-->
    <string name="keywords_wifi">wifi, wi-fi, network connection, internet, wireless, data, wi fi</string>
+    <!-- Search keyword for "Open Network Notification" settings. [CHAR_LIMIT=NONE]-->
+    <string name="keywords_wifi_notify_open_networks">Wi\u2011Fi notification, wifi notification</string>
+    <!-- Search keyword for "Adaptive brightness" settings. [CHAR_LIMIT=NONE]-->
+    <string name="keywords_auto_brightness">Auto brightness</string>
+    <!-- Search keyword for "Vibrate on touch" settings. [CHAR_LIMIT=NONE]-->
+    <string name="keywords_vibrate_on_touch">Stop vibration, tap, keyboard</string>
+    <!-- Search keyword for "Time format" settings. [CHAR_LIMIT=NONE]-->
+    <string name="keywords_time_format">Use 24-hour format</string>
+    <!-- Search keyword for "Files" settings under Settings > Storage. [CHAR_LIMIT=NONE]-->
+    <string name="keywords_storage_files">Download</string>
+    <!-- Search keyword for "Default Apps" settings [CHAR_LIMIT=NONE]-->
+    <string name="keywords_app_default">Open with</string>
+    <!-- Search keyword for "App info" settings [CHAR_LIMIT=NONE]-->
+    <string name="keywords_applications_settings">Applications</string>
+    <!-- Search keyword for "Time zone" settings [CHAR_LIMIT=NONE]-->
+    <string name="keywords_time_zone">timezone</string>
+    <!-- Search keyword for "Display over other apps" settings [CHAR_LIMIT=NONE]-->
+    <string name="keywords_draw_overlay">Chat head</string>
    <string name="keywords_change_wifi_state">wifi, wi-fi, toggle, control</string>
    <string name="keywords_more_default_sms_app">text message, texting, messages, messaging, default</string>
    <string name="keywords_more_mobile_networks">cellular, mobile, cell carrier, wireless, data, 4g,3g, 2g, lte</string>
@@ -7134,7 +7150,8 @@
    <string name="keywords_display_night_display">dim screen, night, tint, night shift, brightness, screen color, colour, color</string>
    <string name="keywords_display_wallpaper">background, personalize, customize display</string>
    <string name="keywords_display_font_size">text size</string>
-    <string name="keywords_display_cast_screen">project, cast</string>
+    <!-- Search keyword for "Cast" settings [CHAR_LIMIT=NONE]-->
+    <string name="keywords_display_cast_screen">project, cast, Screen mirroring, Screen sharing, mirroring, share screen, screen casting</string>
    <string name="keywords_storage">space, disk, hard drive, device usage</string>
    <string name="keywords_battery">power usage, charge</string>
    <string name="keywords_spell_checker">spelling, dictionary, spellcheck, auto-correct</string>
@@ -7187,7 +7204,7 @@
    <string name="keywords_ambient_display_screen">Ambient display, Lock screen display</string>

    <!-- Search keyword for lock screen notification setting [CHAR_LIMIT=NONE] -->
-    <string name="keywords_lock_screen_notif">lock screen notification</string>
+    <string name="keywords_lock_screen_notif">lock screen notification, notifications</string>

    <!-- Search keyword for face settings. -->
    <string name="keywords_face_settings">face</string>
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -28,7 +28,8 @@
        android:title="@string/applications_settings"
        android:order="-999"
        android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
-        settings:controller="com.android.settings.applications.AllAppsInfoPreferenceController"/>
+        settings:controller="com.android.settings.applications.AllAppsInfoPreferenceController"
+        settings:keywords="@string/keywords_applications_settings"/>

    <com.android.settingslib.widget.LayoutPreference
        android:key="recent_open_apps"
--- a/res/xml/app_default_settings.xml
+++ b/res/xml/app_default_settings.xml
@@ -19,7 +19,8 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:settings="http://schemas.android.com/apk/res-auto"
    android:key="app_default_settings_screen"
-    android:title="@string/app_default_dashboard_title">
+    android:title="@string/app_default_dashboard_title"
+    settings:keywords="@string/keywords_app_default">

    <com.android.settingslib.widget.apppreference.AppPreference
        android:key="assist_and_voice_input"
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.xml
@@ -56,12 +56,14 @@
            android:title="@string/date_time_set_timezone_title"
            android:summary="@string/summary_placeholder"
            android:fragment="com.android.settings.datetime.timezone.TimeZoneSettings"
-            settings:userRestriction="no_config_date_time" />
+            settings:userRestriction="no_config_date_time"
+            settings:keywords="@string/keywords_time_zone"/>
    </PreferenceCategory>

    <PreferenceCategory
        android:key="time_format_preference_category"
-        android:title="@string/time_format_category_title">
+        android:title="@string/time_format_category_title"
+        settings:keywords="@string/keywords_time_format">
        <SwitchPreference
            android:key="auto_24hour"
            android:title="@string/date_time_24hour_auto"/>
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -44,7 +44,8 @@
        android:title="@string/auto_brightness_title"
        android:summary="@string/summary_placeholder"
        android:fragment="com.android.settings.display.AutoBrightnessSettings"
-        settings:controller="com.android.settings.display.AutoBrightnessPreferenceController" />
+        settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"
+        settings:keywords="@string/keywords_auto_brightness"/>

    <com.android.settingslib.RestrictedPreference
        android:key="wallpaper"
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -124,7 +124,8 @@
        android:dialogTitle="@string/ringtone_title"
        android:summary="@string/summary_placeholder"
        android:ringtoneType="ringtone"
-        android:order="-100"/>
+        android:order="-100"
+        settings:keywords="@string/sound_settings"/>

    <!-- Default notification ringtone -->
    <com.android.settings.DefaultRingtonePreference
@@ -180,7 +181,8 @@
        <SwitchPreference
          android:key="vibrate_on_touch"
          android:title="@string/vibrate_on_touch_title"
-          android:summary="@string/vibrate_on_touch_summary" />
+          android:summary="@string/vibrate_on_touch_summary"
+          settings:keywords="@string/keywords_vibrate_on_touch"/>

        <!-- Dock speaker plays -->
        <DropDownPreference
--- a/res/xml/storage_dashboard_fragment.xml
+++ b/res/xml/storage_dashboard_fragment.xml
@@ -62,7 +62,8 @@
        android:key="pref_files"
        android:title="@string/storage_files"
        android:icon="@drawable/ic_folder_vd_theme_24"
-        android:order="7" />
+        android:order="7"
+        settings:keywords="@string/keywords_storage_files"/>
    <com.android.settings.deviceinfo.StorageItemPreference
        android:key="pref_system"
        android:title="@string/storage_detail_system"
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -36,7 +36,8 @@
        android:key="notify_open_networks"
        android:title="@string/wifi_notify_open_networks"
        android:icon="@drawable/ic_open_wifi_notifications"
-        android:summary="@string/wifi_notify_open_networks_summary" />
+        android:summary="@string/wifi_notify_open_networks_summary"
+        settings:keywords="@string/keywords_wifi_notify_open_networks"/>

    <SwitchPreference
        android:key="wifi_cellular_data_fallback"
--- a/res/xml/wifi_display_settings.xml
+++ b/res/xml/wifi_display_settings.xml
@@ -16,7 +16,9 @@

 <PreferenceScreen
    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
    android:key="wifi_display_settings_screen"
-    android:title="@string/wifi_display_settings_title">
+    android:title="@string/wifi_display_settings_title"
+    settings:keywords="@string/keywords_display_cast_screen">

 </PreferenceScreen>
--- a/tests/robotests/assets/grandfather_not_implementing_index_provider
+++ b/tests/robotests/assets/grandfather_not_implementing_index_provider
@@ -19,6 +19,7 @@ com.android.settings.applications.ProcessStatsSummary
 com.android.settings.applications.ProcessStatsUi
 com.android.settings.applications.RunningServices
 com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetails
+com.android.settings.applications.specialaccess.zenaccess.ZenAccessDetails
 com.android.settings.applications.UsageAccessDetails
 com.android.settings.backup.ToggleBackupSettingFragment
 com.android.settings.biometrics.fingerprint.FingerprintSettings$FingerprintSettingsFragment