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

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

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

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

Change-Id: Idf2164d0eaebb726f636683545bf9d893a52e58a
parents 9acf9bf5 6eff44d1

res/values/strings.xml

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

src/com/android/customization/widget/ThemeInfoView.java

+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);