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

Commit 4ebd3d4b authored by Santiago Etchebehere's avatar Santiago Etchebehere
Browse files

Merging ub-launcher3-qt-r1-dev, build 5724722 

Test: Manual

Bug:137086778 P3 Bundled theme accent color in picker do not change with dark theme
Bug:64712476 P3 Import translations for dev branches
Change-Id: Idc53e1acf8400b645cb2ef10c228d37ff5a0378d
parents 70528c08 6b74881f

res/values-es-rUS/strings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ 
    <string name="apply_theme_error_msg" msgid="791364062636538317">"Se produjo un error al aplicar el estilo"</string>

    <string name="apply_theme_error_msg" msgid="791364062636538317">"Se produjo un error al aplicar el estilo"</string>

    <string name="custom_theme_next" msgid="6235420097213197301">"Siguiente"</string>

    <string name="custom_theme_next" msgid="6235420097213197301">"Siguiente"</string>

    <string name="custom_theme_previous" msgid="4941132112640503022">"Anterior"</string>

    <string name="custom_theme_previous" msgid="4941132112640503022">"Anterior"</string>

    <string name="custom_theme_title" msgid="2192300350332693631">"<xliff:g id="ID_1">%1$d</xliff:g> personalizado"</string>

    <string name="custom_theme_title" msgid="2192300350332693631">"Personalizado <xliff:g id="ID_1">%1$d</xliff:g>"</string>

    <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Estilo personalizado"</string>

    <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Estilo personalizado"</string>

    <string name="custom_theme_delete" msgid="4744494663184126202">"Borrar"</string>

    <string name="custom_theme_delete" msgid="4744494663184126202">"Borrar"</string>

    <string name="font_component_title" msgid="8800340833695292049">"Elegir fuente"</string>

    <string name="font_component_title" msgid="8800340833695292049">"Elegir fuente"</string>

res/values-in/strings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
    <string name="grid_title" msgid="2825094404523390773">"Petak"</string>

    <string name="grid_title" msgid="2825094404523390773">"Petak"</string>

    <string name="wallpaper_title" msgid="6952635398953194544">"Wallpaper"</string>

    <string name="wallpaper_title" msgid="6952635398953194544">"Wallpaper"</string>

    <string name="apply_theme_btn" msgid="6293081192321303991">"Terapkan"</string>

    <string name="apply_theme_btn" msgid="6293081192321303991">"Terapkan"</string>

    <string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tap untuk mengedit"</string>

    <string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Ketuk untuk mengedit"</string>

    <string name="keep_my_wallpaper" msgid="8012385376769568517">"Pertahankan wallpaper saat ini"</string>

    <string name="keep_my_wallpaper" msgid="8012385376769568517">"Pertahankan wallpaper saat ini"</string>

    <string name="apply_btn" msgid="7965877231041987336">"Terapkan"</string>

    <string name="apply_btn" msgid="7965877231041987336">"Terapkan"</string>

    <string name="accessibility_preview_pager" msgid="3548503287402185430">"Halaman <xliff:g id="ID_1">%1$d</xliff:g> dari <xliff:g id="ID_2">%2$d</xliff:g>"</string>

    <string name="accessibility_preview_pager" msgid="3548503287402185430">"Halaman <xliff:g id="ID_1">%1$d</xliff:g> dari <xliff:g id="ID_2">%2$d</xliff:g>"</string>

src/com/android/customization/model/theme/ThemeBundle.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ public class ThemeBundle implements CustomizationOption<ThemeBundle> { 
                mPreviewInfo.headlineFontFamily);

                mPreviewInfo.headlineFontFamily);

        if (mPreviewInfo.shapeDrawable != null) {

        if (mPreviewInfo.shapeDrawable != null) {

            ((ShapeDrawable) mPreviewInfo.shapeDrawable).getPaint().setColor(

            ((ShapeDrawable) mPreviewInfo.shapeDrawable).getPaint().setColor(

                    mPreviewInfo.colorAccentLight);

                    mPreviewInfo.resolveAccentColor(res));

            ((ImageView) view.findViewById(R.id.theme_option_shape)).setImageDrawable(

            ((ImageView) view.findViewById(R.id.theme_option_shape)).setImageDrawable(

                    mPreviewInfo.shapeDrawable);

                    mPreviewInfo.shapeDrawable);

        }

        }