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

Commit 64d32960 authored by Julia Tuttle's avatar Julia Tuttle Committed by Ioana Alexandru
Browse files

Make shouldForceThemeIcon a param in MonoIconThemeController 

This allows us to more easily customize this behavior based on the use
case.

Bug: 406507218
Test: manual
Flag: EXEMPT minor change
Change-Id: Idb22a8a8bf723a7e6803886a1a4b45869219964d
parent 76ac1cf8

iconloaderlib/res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -27,7 +27,4 @@ 
    <string name="calendar_component_name" translatable="false"></string>

    <string name="clock_component_name" translatable="false"></string>



    <!-- Configures whether to enable forced theme icon, disabled by default -->

    <bool name="enable_forced_themed_icon">false</bool>



</resources>
 
 No newline at end of file

iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java

+0 −12
Original line number Diff line number Diff line
@@ -98,8 +98,6 @@ public class BaseIconFactory implements AutoCloseable { 


    private static int PLACEHOLDER_BACKGROUND_COLOR = Color.rgb(245, 245, 245);



    private final boolean mShouldForceThemeIcon;



    protected BaseIconFactory(Context context, int fullResIconDpi, int iconBitmapSize,

            boolean unused) {

        this(context, fullResIconDpi, iconBitmapSize);
@@ -115,9 +113,6 @@ public class BaseIconFactory implements AutoCloseable { 
        mCanvas = new Canvas();

        mCanvas.setDrawFilter(new PaintFlagsDrawFilter(DITHER_FLAG, FILTER_BITMAP_FLAG));

        clear();



        mShouldForceThemeIcon = mContext.getResources().getBoolean(

                R.bool.enable_forced_themed_icon);

    }



    protected void clear() {
@@ -268,13 +263,6 @@ public class BaseIconFactory implements AutoCloseable { 
        return op;

    }



    /**

     * @return True if forced theme icon is enabled

     */

    public boolean shouldForceThemeIcon() {

        return mShouldForceThemeIcon;

    }



    @NonNull

    protected UserIconInfo getUserInfo(@NonNull UserHandle user) {

        int key = user.hashCode();

iconloaderlib/src/com/android/launcher3/icons/mono/MonoIconThemeController.kt

+3 −2
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ import java.nio.ByteBuffer 


@TargetApi(Build.VERSION_CODES.TIRAMISU)

class MonoIconThemeController(

    private val colorProvider: (Context) -> IntArray = ThemedIconDrawable.Companion::getColors

    private val shouldForceThemeIcon: Boolean = false,

    private val colorProvider: (Context) -> IntArray = ThemedIconDrawable.Companion::getColors,

) : IconThemeController {



    override val themeID = "with-theme"
@@ -63,7 +64,7 @@ class MonoIconThemeController( 
                info,

                factory.getShapePath(icon, Rect(0, 0, info.icon.width, info.icon.height)),

                sourceHint?.isFileDrawable ?: false,

                factory.shouldForceThemeIcon(),

                shouldForceThemeIcon,

            )

        if (mono != null) {

            return MonoThemedBitmap(