PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add theme component options to settings keywords."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-07-02 22:51:25 +00:00
committed by Android (Google) Code Review
parent 6bc3378f3d be8345e565
commit 6bb07bf056
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@@ -7406,6 +7406,9 @@
<!-- List of synonyms for the Wallpaper picker setting, used to match in settings search [CHAR LIMIT=NONE] --> <!-- 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> <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] --> <!-- 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> <string name="keywords_assist_input">default, assistant</string>
@@ -10001,8 +10004,6 @@
<!-- Notification log debug tool: the word 'none' --> <!-- Notification log debug tool: the word 'none' -->
<string name="notification_log_details_ranking_none">Ranking object doesn\'t contain this key.</string> <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.--> <!-- [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> <string name="theme_customization_device_default">Device default</string>

4
src/com/android/settings/display/WallpaperPreferenceController.java
View File

@@ -69,9 +69,7 @@ public class WallpaperPreferenceController extends BasePreferenceController {
public String getKeywords() { public String getKeywords() {
StringBuilder sb = new StringBuilder(mContext.getString(R.string.keywords_wallpaper)); StringBuilder sb = new StringBuilder(mContext.getString(R.string.keywords_wallpaper));
if (areStylesAvailable()) { if (areStylesAvailable()) {
// TODO(b/130759285): Create a new string keywords_styles_and_wallpaper sb.append(", ").append(mContext.getString(R.string.keywords_styles));
sb.append(", ").append(mContext.getString(R.string.theme_customization_category))
.append(", ").append(mContext.getString(R.string.keywords_dark_ui_mode));
} }
return sb.toString(); return sb.toString();
} }

4
tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
View File

@@ -123,7 +123,7 @@ public class WallpaperPreferenceControllerTest {
assertThat(mController.getKeywords()) assertThat(mController.getKeywords())
.contains(mContext.getString(R.string.keywords_wallpaper)); .contains(mContext.getString(R.string.keywords_wallpaper));
assertThat(mController.getKeywords()) assertThat(mController.getKeywords())
.doesNotContain(mContext.getString(R.string.theme_customization_category)); .doesNotContain(mContext.getString(R.string.keywords_styles));
} }
@Test @Test
@@ -136,7 +136,7 @@ public class WallpaperPreferenceControllerTest {
assertThat(mController.getKeywords()) assertThat(mController.getKeywords())
.contains(mContext.getString(R.string.keywords_wallpaper)); .contains(mContext.getString(R.string.keywords_wallpaper));
assertThat(mController.getKeywords()) assertThat(mController.getKeywords())
.contains(mContext.getString(R.string.theme_customization_category)); .contains(mContext.getString(R.string.keywords_styles));
} }
@Test @Test