commit 88363dfc70170d3560efe9db8117567555e4e830
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 24 20:53:29 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 24 20:53:29 2018 +0000
tree 0cc32d2cc084f7bce224969efe4b6f2ef205523f
parent 74e0961f0c4be8459176154ecf13c103c8ac6c68
parent 1bf1d5a24090ce712cd9437ebcd07ea3519a91f3

Merge "Updated ColorDrawable to implement getColorFilter"

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

diff --git a/graphics/java/android/graphics/drawable/ColorDrawable.java b/graphics/java/android/graphics/drawable/ColorDrawable.java
index 9ae747d..a601d6d 100644
--- a/graphics/java/android/graphics/drawable/ColorDrawable.java
+++ b/graphics/java/android/graphics/drawable/ColorDrawable.java
@@ -21,12 +21,18 @@
 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 @@
         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;