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

Commit f03ed094 authored by Santiago Etchebehere's avatar Santiago Etchebehere Committed by Automerger Merge Worker
Browse files

Merging from ub-launcher3-master @ build 6668015 am: 8a27ba85

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/12122898

Change-Id: I0a7d03b2258894b3690949a717c3b61e4c6026c1
parents 6852959b 8a27ba85
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -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>
+1 −2
Original line number Diff line number Diff line
@@ -58,8 +58,7 @@ public class ThemeInfoView extends LinearLayout {
        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);