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

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

Fixing disabled UI for theme app icons am: ba20fd34 am: ef28a015 

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



Change-Id: I6f6e809f1854b60d244291ea11361172dec96789
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6dc62a8e ef28a015

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

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ public class ClockDrawableWrapper extends AdaptiveIconDrawable implements Bitmap 


    private static final boolean DISABLE_SECONDS = true;

    private static final int NO_COLOR = -1;

    private static final int FULLY_OPAQUE = 255;



    // Time after which the clock icon should check for an update. The actual invalidate

    // will only happen in case of any change.

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

+9 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ public class FastBitmapDrawable extends Drawable implements Drawable.Callback { 


    private static final float DISABLED_DESATURATION = 1f;

    private static final float DISABLED_BRIGHTNESS = 0.5f;

    protected static final int FULLY_OPAQUE = 255;



    public static final int CLICK_FEEDBACK_DURATION = 200;
@@ -329,6 +330,14 @@ public class FastBitmapDrawable extends Drawable implements Drawable.Callback { 
        return new ColorMatrixColorFilter(tempFilterMatrix);

    }



    protected static final int getDisabledColor(int color) {

        int component = (Color.red(color) + Color.green(color) + Color.blue(color)) / 3;

        float scale = 1 - DISABLED_BRIGHTNESS;

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

        component = Math.min(Math.round(scale * component + brightnessI), FULLY_OPAQUE);

        return Color.rgb(component, component, component);

    }



    /**

     * Sets the bounds for the badge drawable based on the main icon bounds

     */

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

+20 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.graphics.Bitmap; 
import android.graphics.BlendMode;

import android.graphics.BlendModeColorFilter;

import android.graphics.Canvas;

import android.graphics.ColorFilter;

import android.graphics.Paint;

import android.graphics.Rect;
@@ -45,6 +46,8 @@ public class ThemedIconDrawable extends FastBitmapDrawable { 
    private final Bitmap mBgBitmap;

    private final Paint mBgPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);



    private final ColorFilter mBgFilter, mMonoFilter;



    protected ThemedIconDrawable(ThemedConstantState constantState) {

        super(constantState.mBitmap, constantState.colorFg);

        bitmapInfo = constantState.bitmapInfo;
@@ -52,10 +55,12 @@ public class ThemedIconDrawable extends FastBitmapDrawable { 
        colorFg = constantState.colorFg;



        mMonoIcon = bitmapInfo.mMono;

        mMonoPaint.setColorFilter(new BlendModeColorFilter(colorFg, BlendMode.SRC_IN));

        mMonoFilter = new BlendModeColorFilter(colorFg, BlendMode.SRC_IN);

        mMonoPaint.setColorFilter(mMonoFilter);



        mBgBitmap = bitmapInfo.mWhiteShadowLayer;

        mBgPaint.setColorFilter(new BlendModeColorFilter(colorBg, BlendMode.SRC_IN));

        mBgFilter = new BlendModeColorFilter(colorBg, BlendMode.SRC_IN);

        mBgPaint.setColorFilter(mBgFilter);

    }



    @Override
@@ -64,6 +69,19 @@ public class ThemedIconDrawable extends FastBitmapDrawable { 
        canvas.drawBitmap(mMonoIcon, null, bounds, mMonoPaint);

    }



    @Override

    protected void updateFilter() {

        super.updateFilter();

        int alpha = mIsDisabled ? (int) (mDisabledAlpha * FULLY_OPAQUE) : FULLY_OPAQUE;

        mBgPaint.setAlpha(alpha);

        mBgPaint.setColorFilter(mIsDisabled ? new BlendModeColorFilter(

                getDisabledColor(colorBg), BlendMode.SRC_IN) : mBgFilter);



        mMonoPaint.setAlpha(alpha);

        mMonoPaint.setColorFilter(mIsDisabled ? new BlendModeColorFilter(

                getDisabledColor(colorFg), BlendMode.SRC_IN) : mMonoFilter);

    }



    @Override

    public boolean isThemed() {

        return true;