summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2015-06-15 15:45:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-15 15:45:57 +0000
commitc03fa1ee54424b0c8b9ecdc06004c9dbdf4925f2 (patch)
tree3231e7d1c1ba8ca879ed0e162704499ecb40c756 /graphics
parent0524e97ac333c685b43cd9dbe5a49b28371b8865 (diff)
parentea1363910bf2138f633ef8a310a65d608ef94407 (diff)
downloadframeworks_base-c03fa1ee54424b0c8b9ecdc06004c9dbdf4925f2.zip
frameworks_base-c03fa1ee54424b0c8b9ecdc06004c9dbdf4925f2.tar.gz
frameworks_base-c03fa1ee54424b0c8b9ecdc06004c9dbdf4925f2.tar.bz2
Merge "Add isFilterBitmap() overrides where appropriate" into mnc-dev
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/drawable/BitmapDrawable.java5
-rw-r--r--graphics/java/android/graphics/drawable/NinePatchDrawable.java8
2 files changed, 13 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/BitmapDrawable.java b/graphics/java/android/graphics/drawable/BitmapDrawable.java
index 6fe6b56..82a592a 100644
--- a/graphics/java/android/graphics/drawable/BitmapDrawable.java
+++ b/graphics/java/android/graphics/drawable/BitmapDrawable.java
@@ -352,6 +352,11 @@ public class BitmapDrawable extends Drawable {
}
@Override
+ public boolean isFilterBitmap() {
+ return mBitmapState.mPaint.isFilterBitmap();
+ }
+
+ @Override
public void setDither(boolean dither) {
mBitmapState.mPaint.setDither(dither);
invalidateSelf();
diff --git a/graphics/java/android/graphics/drawable/NinePatchDrawable.java b/graphics/java/android/graphics/drawable/NinePatchDrawable.java
index 9bf33cf..91bbff7 100644
--- a/graphics/java/android/graphics/drawable/NinePatchDrawable.java
+++ b/graphics/java/android/graphics/drawable/NinePatchDrawable.java
@@ -399,6 +399,14 @@ public class NinePatchDrawable extends Drawable {
}
@Override
+ public boolean isFilterBitmap() {
+ if (mPaint == null) {
+ return false;
+ }
+ return getPaint().isFilterBitmap();
+ }
+
+ @Override
public void inflate(Resources r, XmlPullParser parser, AttributeSet attrs, Theme theme)
throws XmlPullParserException, IOException {
super.inflate(r, parser, attrs, theme);