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

Commit 1bf1d5a2 authored by Nader Jawad's avatar Nader Jawad
Browse files

Updated ColorDrawable to implement getColorFilter 

ColorDrawable previously did not implement getColorFilter despite having
a proper setColorFilter implementation. Updated ColorDrawable to support
getColorFilter returning the corresponding ColorFilter configured on
it's paint.

Change-Id: Iabc3cd1b9110f5c3ec25e26a31966e2a43f8fb16
Fixes:78476471
Test: Re-ran CtsGraphicsTest
parent bccd1711

graphics/java/android/graphics/drawable/ColorDrawable.java

+19 −2
Original line number Diff line number Diff line
@@ -21,12 +21,18 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.TestApi;

import android.content.pm.ActivityInfo.Config;

import android.graphics.*;

import android.graphics.PorterDuff.Mode;

import android.content.res.ColorStateList;

import android.content.res.Resources;

import android.content.res.Resources.Theme;

import android.content.res.TypedArray;

import android.graphics.Canvas;

import android.graphics.ColorFilter;

import android.graphics.Outline;

import android.graphics.Paint;

import android.graphics.PixelFormat;

import android.graphics.PorterDuff.Mode;

import android.graphics.PorterDuffColorFilter;

import android.graphics.Xfermode;

import android.util.AttributeSet;

import android.view.ViewDebug;
@@ -180,6 +186,17 @@ public class ColorDrawable extends Drawable { 
        mPaint.setColorFilter(colorFilter);

    }



    /**

     * Returns the color filter applied to this color configured by

     * {@link #setColorFilter(ColorFilter)}

     *

     * @see android.graphics.drawable.Drawable#getColorFilter()

     */

    @Override

    public @Nullable ColorFilter getColorFilter() {

        return mPaint.getColorFilter();

    }



    @Override

    public void setTintList(ColorStateList tint) {

        mColorState.mTint = tint;