From be8345e5653fc0f943fd9043b2e0df70465f20e3 Mon Sep 17 00:00:00 2001
From: Amin Shaikh <ashaikh@google.com>
Date: Tue, 2 Jul 2019 11:37:57 -0400
Subject: [PATCH] Add theme component options to settings keywords.

Fixes: 135521048
Test: mp settingsg; search for keywords
Change-Id: Ic2c2827fd5b6eff3b8cc11dc5201fc7c4d55778f
---
 res/values/strings.xml                                       | 5 +++--
 .../settings/display/WallpaperPreferenceController.java      | 4 +---
 .../settings/display/WallpaperPreferenceControllerTest.java  | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 55b228be3eb..8020cc46e1f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7406,6 +7406,9 @@
     <!-- List of synonyms for the Wallpaper picker setting, used to match in settings search [CHAR LIMIT=NONE] -->
     <string name="keywords_wallpaper">background, screen, lockscreen, theme</string>
 
+    <!-- List of synonyms for the Styles picker setting, used to match in settings search [CHAR LIMIT=NONE] -->
+    <string name="keywords_styles">icon shape, accent color, font</string>
+
     <!-- List of synonyms for the Default Assist and Voice input setting, used to match in settings search [CHAR LIMIT=NONE] -->
     <string name="keywords_assist_input">default, assistant</string>
 
@@ -10004,8 +10007,6 @@
     <!-- Notification log debug tool: the word 'none' -->
     <string name="notification_log_details_ranking_none">Ranking object doesn\'t contain this key.</string>
 
-    <!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the settings category for theme overlays. -->
-    <string name="theme_customization_category">Theming</string>
     <!-- [CHAR_LIMIT=NONE] Developer Settings: Label for the option that turns off customizations for a given category.-->
     <string name="theme_customization_device_default">Device default</string>
 
diff --git a/src/com/android/settings/display/WallpaperPreferenceController.java b/src/com/android/settings/display/WallpaperPreferenceController.java
index 3ba39e90723..b6af9bcb024 100644
--- a/src/com/android/settings/display/WallpaperPreferenceController.java
+++ b/src/com/android/settings/display/WallpaperPreferenceController.java
@@ -69,9 +69,7 @@ public class WallpaperPreferenceController extends BasePreferenceController {
     public String getKeywords() {
         StringBuilder sb = new StringBuilder(mContext.getString(R.string.keywords_wallpaper));
         if (areStylesAvailable()) {
-            // TODO(b/130759285): Create a new string keywords_styles_and_wallpaper
-            sb.append(", ").append(mContext.getString(R.string.theme_customization_category))
-                    .append(", ").append(mContext.getString(R.string.keywords_dark_ui_mode));
+            sb.append(", ").append(mContext.getString(R.string.keywords_styles));
         }
         return sb.toString();
     }
diff --git a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
index c9a69785d5a..d6ad52d21a7 100644
--- a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
@@ -123,7 +123,7 @@ public class WallpaperPreferenceControllerTest {
         assertThat(mController.getKeywords())
                 .contains(mContext.getString(R.string.keywords_wallpaper));
         assertThat(mController.getKeywords())
-                .doesNotContain(mContext.getString(R.string.theme_customization_category));
+                .doesNotContain(mContext.getString(R.string.keywords_styles));
     }
 
     @Test
@@ -136,7 +136,7 @@ public class WallpaperPreferenceControllerTest {
         assertThat(mController.getKeywords())
                 .contains(mContext.getString(R.string.keywords_wallpaper));
         assertThat(mController.getKeywords())
-                .contains(mContext.getString(R.string.theme_customization_category));
+                .contains(mContext.getString(R.string.keywords_styles));
     }
 
     @Test