commit 6a9fb4b6dd5703bfaabab9433b6f702e532f638d
author Alan Viverette <alanv@google.com> Thu Dec 11 01:40:17 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 11 01:40:17 2014 +0000
tree 955c7c9e113be1973bdc0798134ac10e6b11fdfb
parent e9a8205b5dd5888c6b95b6d76c4290df5a2c7952
parent 7d0aed2d2c0c2fd4bcaa0e786efd6134ae162d07

am 7d0aed2d: am 4e137437: Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev automerge: c211857

* commit '7d0aed2d2c0c2fd4bcaa0e786efd6134ae162d07':
  Update tint filter after setting gradient drawable state

graphics/java/android/graphics/drawable/GradientDrawable.java

diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java
index 12b707b..5533d5e 100644
--- a/graphics/java/android/graphics/drawable/GradientDrawable.java
+++ b/graphics/java/android/graphics/drawable/GradientDrawable.java
@@ -1795,5 +1795,7 @@
                 mStrokePaint.setPathEffect(e);
             }
         }
+
+        mTintFilter = updateTintFilter(mTintFilter, s.mTint, s.mTintMode);
     }
 }