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

2018-04-23 02:26:58 +00:00
parent e71fb69ec9 c85057c14c
commit cf893ac40c
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) {