Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be8345e5 authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Add theme component options to settings keywords. 

Fixes: 135521048
Test: mp settingsg; search for keywords
Change-Id: Ic2c2827fd5b6eff3b8cc11dc5201fc7c4d55778f
parent b62a45e1

res/values/strings.xml

+3 −2
Original line number Diff line number Diff line
@@ -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>

































src/com/android/settings/display/WallpaperPreferenceController.java



+1
−3






























Original line number
Diff line number
Diff line







@@ -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();









    }
































tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java



+2
−2






























Original line number
Diff line number
Diff line







@@ -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