Merging from ub-launcher3-master @ build 6668015
Bug:154410862
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_rvc-d1-dev_6668015.html
Change-Id: I9a989e6cd3f5f2e618af98685691d05549630f44
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d12b05e..55de455 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -210,7 +210,6 @@
<!-- Title for a section of a style preview screen that shows a preview of the style color and icons. [CHAR_LIMIT=30]-->
<string name="theme_preview_icons_section_title">Color / Icons</string>
- <!-- Bottom sheet dialog which displaying different theme's info. [CHAR_LIMIT=80]
- (eg, Fonts, icons, shape, color will change to the "Default" Style) -->
- <string name="style_info_description">Fonts, icons, shape, color will change to the <xliff:g name="style_name">%1$s</xliff:g> Style</string>
+ <!-- Bottom sheet dialog which displaying different theme's info. [CHAR_LIMIT=80] -->
+ <string name="style_info_description">Preview of font, icons, app shape, and color</string>
</resources>
diff --git a/src/com/android/customization/widget/ThemeInfoView.java b/src/com/android/customization/widget/ThemeInfoView.java
index b21b96f..9eb0320 100644
--- a/src/com/android/customization/widget/ThemeInfoView.java
+++ b/src/com/android/customization/widget/ThemeInfoView.java
@@ -58,8 +58,7 @@
ThemeBundle.PreviewInfo previewInfo = selectedTheme.getPreviewInfo();
if (previewInfo != null) {
- mTitle.setText(getContext().getString(
- R.string.style_info_description, selectedTheme.getTitle()));
+ mTitle.setText(getContext().getString(R.string.style_info_description));
if (previewInfo.headlineFontFamily != null) {
mTitle.setTypeface(previewInfo.headlineFontFamily);
mFontPreviewTextView.setTypeface(previewInfo.headlineFontFamily);