diff --git a/res/values/strings.xml b/res/values/strings.xml index b2328dacb47..db2231faf75 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -7406,6 +7406,9 @@ background, screen, lockscreen, theme + + icon shape, accent color, font + default, assistant @@ -10001,8 +10004,6 @@ Ranking object doesn\'t contain this key. - - Theming Device default 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