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

Commit 8ecfcb46 authored by Steven Ng's avatar Steven Ng Committed by Automerger Merge Worker
Browse files

Expose disabled color filter for drawable am: badf5f5f am: 2315e3db 

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

Change-Id: Icb06204ce1cbd94e41c1a137515196baa9d593e2
parents 2093a078 2315e3db

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

+20 −16
Original line number Diff line number Diff line
@@ -253,22 +253,7 @@ public class FastBitmapDrawable extends Drawable { 


    private ColorFilter getDisabledColorFilter() {

        if (sDisabledFColorFilter == null) {

            ColorMatrix tempBrightnessMatrix = new ColorMatrix();

            ColorMatrix tempFilterMatrix = new ColorMatrix();



            tempFilterMatrix.setSaturation(1f - DISABLED_DESATURATION);

            float scale = 1 - DISABLED_BRIGHTNESS;

            int brightnessI =   (int) (255 * DISABLED_BRIGHTNESS);

            float[] mat = tempBrightnessMatrix.getArray();

            mat[0] = scale;

            mat[6] = scale;

            mat[12] = scale;

            mat[4] = brightnessI;

            mat[9] = brightnessI;

            mat[14] = brightnessI;

            mat[18] = mDisabledAlpha;

            tempFilterMatrix.preConcat(tempBrightnessMatrix);

            sDisabledFColorFilter = new ColorMatrixColorFilter(tempFilterMatrix);

            sDisabledFColorFilter = getDisabledFColorFilter(mDisabledAlpha);

        }

        return sDisabledFColorFilter;

    }
@@ -286,6 +271,25 @@ public class FastBitmapDrawable extends Drawable { 
        return new FastBitmapConstantState(mBitmap, mIconColor, mIsDisabled);

    }



    public static ColorFilter getDisabledFColorFilter(float disabledAlpha) {

        ColorMatrix tempBrightnessMatrix = new ColorMatrix();

        ColorMatrix tempFilterMatrix = new ColorMatrix();



        tempFilterMatrix.setSaturation(1f - DISABLED_DESATURATION);

        float scale = 1 - DISABLED_BRIGHTNESS;

        int brightnessI =   (int) (255 * DISABLED_BRIGHTNESS);

        float[] mat = tempBrightnessMatrix.getArray();

        mat[0] = scale;

        mat[6] = scale;

        mat[12] = scale;

        mat[4] = brightnessI;

        mat[9] = brightnessI;

        mat[14] = brightnessI;

        mat[18] = disabledAlpha;

        tempFilterMatrix.preConcat(tempBrightnessMatrix);

        return new ColorMatrixColorFilter(tempBrightnessMatrix);

    }



    protected static class FastBitmapConstantState extends ConstantState {

        protected final Bitmap mBitmap;

        protected final int mIconColor;