diff options
| author | Alan Viverette <alanv@google.com> | 2015-06-06 00:26:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-06 00:26:04 +0000 |
| commit | 371b582c4941a7c4a1a5531fa8768db74354b616 (patch) | |
| tree | 9627de0a040b3143a1ede048fae5da02586677e8 /graphics | |
| parent | dd99df0dbe21b73f437de1beb910b8ef7a2b6f30 (diff) | |
| parent | a74171190077d5ef8704a29442669e806447d560 (diff) | |
| download | frameworks_base-371b582c4941a7c4a1a5531fa8768db74354b616.zip frameworks_base-371b582c4941a7c4a1a5531fa8768db74354b616.tar.gz frameworks_base-371b582c4941a7c4a1a5531fa8768db74354b616.tar.bz2 | |
Merge "Implement getColorFilter() on VectorDrawable" into mnc-dev
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/VectorDrawable.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index b9f3f2a..5e205bd 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -311,6 +311,11 @@ public class VectorDrawable extends Drawable { } @Override + public ColorFilter getColorFilter() { + return mColorFilter; + } + + @Override public void setTintList(ColorStateList tint) { final VectorDrawableState state = mVectorState; if (state.mTint != tint) { |