commit dba97ba1479bccb3535dc38196930beac4352c16
author Selim Cinek <cinek@google.com> Sun Apr 22 19:59:01 2018 -0700
committer android-build-merger <android-build-merger@google.com> Sun Apr 22 19:59:01 2018 -0700
tree 652509acd344f73c18b73203e791f2db9b59e04f
parent 3ebda73095ec765b35fe724387266ef40a72bbb2
parent d4c4d946ae830fbd0f4486f5205be912ef84a1f5

Merge "Made the DrawableWrapper return the right ColorFilter" into pi-dev am: cf893ac40c
am: d4c4d946ae

Change-Id: I064ead2161ed1c1a0b91141fdf828eb6c9d7ce1d

graphics/java/android/graphics/drawable/DrawableWrapper.java

diff --git a/graphics/java/android/graphics/drawable/DrawableWrapper.java b/graphics/java/android/graphics/drawable/DrawableWrapper.java
index a9e0f9a..4ce3b10 100644
--- a/graphics/java/android/graphics/drawable/DrawableWrapper.java
+++ b/graphics/java/android/graphics/drawable/DrawableWrapper.java
@@ -307,6 +307,15 @@
     }
 
     @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) {
             mDrawable.setTintList(tint);