summaryrefslogtreecommitdiff
path: root/graphics/java/android
diff options
context:
space:
mode:
author John Spurlock <jspurlock@google.com> 2014-08-21 19:13:57 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-08-21 19:13:58 +0000
commit0df011725ce254c39cf2b83e337247f439c99f82 (patch)
tree8f5e9b34742e0e0a7d5d50cbe392e54abf830a8e /graphics/java/android
parent1889c5c36df8cd027f1f3f69aa227a6bdad17849 (diff)
parent38b5f597de96cd892add9017dc810212f549bf68 (diff)
Merge "Implement GradientDrawable getColorFilter." into lmp-dev
Diffstat (limited to 'graphics/java/android')
-rw-r--r--graphics/java/android/graphics/drawable/GradientDrawable.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java
index 29b914153461..2c8611e794f6 100644
--- a/graphics/java/android/graphics/drawable/GradientDrawable.java
+++ b/graphics/java/android/graphics/drawable/GradientDrawable.java
@@ -811,6 +811,11 @@ public class GradientDrawable extends Drawable {
}
@Override
+ public ColorFilter getColorFilter() {
+ return mColorFilter;
+ }
+
+ @Override
public void setColorFilter(ColorFilter cf) {
if (cf != mColorFilter) {
mColorFilter = cf;