Merge "Made the DrawableWrapper return the right ColorFilter" into pi-dev

am: cf893ac40c Change-Id: I60a5a5901a2eeb787d4750819130ded347808f8a
2018-04-22 19:49:04 -07:00
parent 7fd0902453 cf893ac40c
commit d4c4d946ae
1 changed files with 9 additions and 0 deletions
--- a/graphics/java/android/graphics/drawable/DrawableWrapper.java
+++ b/graphics/java/android/graphics/drawable/DrawableWrapper.java
@@ -295,6 +295,15 @@ public abstract class DrawableWrapper extends Drawable implements Drawable.Callb
        }
    }

+    @Override
+    public ColorFilter getColorFilter() {
+        final Drawable drawable = getDrawable();
+        if (drawable != null) {
+            return drawable.getColorFilter();
+        }
+        return super.getColorFilter();
+    }
+
    @Override
    public void setTintList(@Nullable ColorStateList tint) {
        if (mDrawable != null) {