From 8b6e115629af9971d364690cefae0957b47b7a4b Mon Sep 17 00:00:00 2001
From: Xiaowen Lei <xilei@google.com>
Date: Wed, 20 Apr 2022 15:47:36 +0000
Subject: [PATCH] Set "screensaver" as synonym of "Screen saver" for Settings
 search.

Also set android:id attribute for Screen saver preference screen.
When the attribute is unset, the search result is removed.

Bug: 229106045
Fix: 229106045
Test: on device. Forced Settings search re-indexing.

Change-Id: Ibaff9baacb28ecc5b41ac9c1e264b4ab28a83ce9
---
 res/values/strings.xml              | 2 ++
 res/xml/display_settings.xml        | 3 ++-
 res/xml/dream_fragment_overview.xml | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c882d966dc7..52b163cadcc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3193,6 +3193,8 @@
     <string name="style_suggestion_summary">Try different styles, wallpapers, and more</string>
     <!-- Display settings screen, trigger for screen saver options [CHAR LIMIT=30] -->
     <string name="screensaver_settings_title">Screen saver</string>
+    <!-- List of synonyms used in the settings search bar to find the “Screen saver”. [CHAR LIMIT=NONE] -->
+    <string name="keywords_screensaver">screensaver</string>
     <!-- The title for the toggle which disables/enables screen savers [CHAR_LIMIT=30] -->
     <string name="screensaver_settings_toggle_title">Use screen saver</string>
     <!-- Display settings screen, summary fragment for screen saver options, activated when docked or asleep and charging [CHAR LIMIT=35] -->
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 03d073b2e67..0649eeef477 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -144,7 +144,8 @@
         <Preference
             android:key="screensaver"
             android:title="@string/screensaver_settings_title"
-            android:fragment="com.android.settings.dream.DreamSettings"/>
+            android:fragment="com.android.settings.dream.DreamSettings"
+            settings:keywords="@string/keywords_screensaver"/>
 
         <SwitchPreference
             android:key="camera_gesture"
diff --git a/res/xml/dream_fragment_overview.xml b/res/xml/dream_fragment_overview.xml
index 9a401a36a2b..a7b54929ddf 100644
--- a/res/xml/dream_fragment_overview.xml
+++ b/res/xml/dream_fragment_overview.xml
@@ -17,7 +17,9 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:title="@string/screensaver_settings_title">
+    android:key="screensaver_settings_screen"
+    android:title="@string/screensaver_settings_title"
+    settings:keywords="@string/keywords_screensaver">
 
     <com.android.settingslib.widget.MainSwitchPreference
         android:key="dream_main_settings_switch"