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

Commit 9408481d authored by Sunny Goyal's avatar Sunny Goyal Committed by Automerger Merge Worker
Browse files

Adding support for overriding monochrome icon logic am: 73e98d6a am: b164c0da 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/systemui/+/20653060



Change-Id: I69cb71cd28c2b6adf3d0624a99714789540e36a8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65394172 b164c0da

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

+19 −8
Original line number Diff line number Diff line
@@ -220,20 +220,31 @@ public class BaseIconFactory implements AutoCloseable { 


        if (icon instanceof BitmapInfo.Extender) {

            info = ((BitmapInfo.Extender) icon).getExtendedInfo(bitmap, color, this, scale[0]);

        } else if (mMonoIconEnabled && IconProvider.ATLEAST_T

                && icon instanceof AdaptiveIconDrawable) {

            Drawable mono = ((AdaptiveIconDrawable) icon).getMonochrome();

        } else if (IconProvider.ATLEAST_T && mMonoIconEnabled) {

            Drawable mono = getMonochromeDrawable(icon);

            if (mono != null) {

                // Convert mono drawable to bitmap

                Drawable paddedMono = new ClippedMonoDrawable(mono);

                info.setMonoIcon(

                        createIconBitmap(paddedMono, scale[0], MODE_ALPHA), this);

                info.setMonoIcon(createIconBitmap(mono, scale[0], MODE_ALPHA), this);

            }

        }

        info = info.withFlags(getBitmapFlagOp(options));

        return info;

    }



    /**

     * Returns a monochromatic version of the given drawable or null, if it is not supported

     * @param base the original icon

     */

    @TargetApi(Build.VERSION_CODES.TIRAMISU)

    protected Drawable getMonochromeDrawable(Drawable base) {

        if (base instanceof AdaptiveIconDrawable) {

            Drawable mono = ((AdaptiveIconDrawable) base).getMonochrome();

            if (mono != null) {

                return new ClippedMonoDrawable(mono);

            }

        }

        return null;

    }



    @NonNull

    public FlagOp getBitmapFlagOp(@Nullable IconOptions options) {

        FlagOp op = FlagOp.NO_OP;
@@ -528,7 +539,7 @@ public class BaseIconFactory implements AutoCloseable { 
        }

    }



    private static class ClippedMonoDrawable extends InsetDrawable {

    protected static class ClippedMonoDrawable extends InsetDrawable {



        @NonNull

        private final AdaptiveIconDrawable mCrop;