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

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

Adding support for overriding extracted color in IconOptions am: 4c6a28c6 

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



Change-Id: I4bb71264253458e0d84ddb271e192eea0c059a9e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 492d3e3b 4c6a28c6

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

+17 −19
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ import android.graphics.drawable.Drawable; 
import android.graphics.drawable.InsetDrawable;

import android.os.Build;

import android.os.UserHandle;

import android.util.Log;

import android.util.SparseBooleanArray;



import androidx.annotation.ColorInt;

import androidx.annotation.IntDef;

import androidx.annotation.NonNull;

import androidx.annotation.Nullable;
@@ -82,8 +82,6 @@ public class BaseIconFactory implements AutoCloseable { 
    @NonNull

    private final ColorExtractor mColorExtractor;



    private boolean mDisableColorExtractor;



    protected final int mFillResIconDpi;

    protected final int mIconBitmapSize;
@@ -126,7 +124,6 @@ public class BaseIconFactory implements AutoCloseable { 


    protected void clear() {

        mWrapperBackgroundColor = DEFAULT_WRAPPER_BACKGROUND;

        mDisableColorExtractor = false;

    }



    @NonNull
@@ -180,7 +177,7 @@ public class BaseIconFactory implements AutoCloseable { 
            icon = createIconBitmap(new BitmapDrawable(mContext.getResources(), icon), 1f);

        }



        return BitmapInfo.of(icon, extractColor(icon));

        return BitmapInfo.of(icon, mColorExtractor.findDominantColorByHue(icon));

    }



    /**
@@ -217,7 +214,8 @@ public class BaseIconFactory implements AutoCloseable { 
        icon = normalizeAndWrapToAdaptiveIcon(icon, shrinkNonAdaptiveIcons, null, scale);

        Bitmap bitmap = createIconBitmap(icon, scale[0], MODE_WITH_SHADOW);



        int color = extractColor(bitmap);

        int color = (options != null && options.mExtractedColor != null)

                ? options.mExtractedColor : mColorExtractor.findDominantColorByHue(bitmap);

        BitmapInfo info = BitmapInfo.of(bitmap, color);



        if (icon instanceof BitmapInfo.Extender) {
@@ -288,13 +286,6 @@ public class BaseIconFactory implements AutoCloseable { 
        mWrapperBackgroundColor = (Color.alpha(color) < 255) ? DEFAULT_WRAPPER_BACKGROUND : color;

    }



    /**

     * Disables the dominant color extraction for all icons loaded.

     */

    public void disableColorExtraction() {

        mDisableColorExtractor = true;

    }



    @Nullable

    protected Drawable normalizeAndWrapToAdaptiveIcon(@Nullable Drawable icon,

            final boolean shrinkNonAdaptiveIcons, @Nullable final RectF outIconBounds,
@@ -448,10 +439,6 @@ public class BaseIconFactory implements AutoCloseable { 
                android.R.drawable.sym_def_app_icon, iconDpi));

    }



    private int extractColor(@NonNull final Bitmap bitmap) {

        return mDisableColorExtractor ? 0 : mColorExtractor.findDominantColorByHue(bitmap);

    }



    /**

     * Returns the correct badge size given an icon size

     */
@@ -465,8 +452,10 @@ public class BaseIconFactory implements AutoCloseable { 


        boolean mIsInstantApp;



        @Nullable

        UserHandle mUserHandle;

        @Nullable UserHandle mUserHandle;



        @ColorInt

        @Nullable Integer mExtractedColor;



        /**

         * Set to false if non-adaptive icons should not be treated
@@ -494,6 +483,15 @@ public class BaseIconFactory implements AutoCloseable { 
            mIsInstantApp = instantApp;

            return this;

        }



        /**

         * Disables auto color extraction and overrides the color to the provided value

         */

        @NonNull

        public IconOptions setExtractedColor(@ColorInt int color) {

            mExtractedColor = color;

            return this;

        }

    }



    /**

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

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class ColorExtractor { 
     * This picks a dominant color, looking for high-saturation, high-value, repeated hues.

     * @param bitmap The bitmap to scan

     */

    public int findDominantColorByHue(@NonNull final Bitmap bitmap, final int samples) {

    protected int findDominantColorByHue(@NonNull final Bitmap bitmap, final int samples) {

        final int height = bitmap.getHeight();

        final int width = bitmap.getWidth();

        int sampleStride = (int) Math.sqrt((height * width) / samples);