summaryrefslogtreecommitdiff
path: root/core/java/android/widget/ImageView.java
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2015-07-14 13:36:27 -0700
committerChris Craik <ccraik@google.com>2015-07-16 13:14:04 -0700
commit82af13ea831bbf8dbb8caf06b8ecbee5a31fc446 (patch)
tree4dcb7b3e53cff134904d32465f2944b35c3726fd /core/java/android/widget/ImageView.java
parentd0756379715cb88a1f6a87dccbf6d7d92dad479f (diff)
Remove ImageViewBitmapDrawable class
Change-Id: Ie25b4b39cb5d0984981c153b036ea9ade95a10f7
Diffstat (limited to 'core/java/android/widget/ImageView.java')
-rw-r--r--core/java/android/widget/ImageView.java16
1 files changed, 2 insertions, 14 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java
index e13b96fb5ba1..836495179dfe 100644
--- a/core/java/android/widget/ImageView.java
+++ b/core/java/android/widget/ImageView.java
@@ -91,7 +91,7 @@ public class ImageView extends View {
private boolean mColorMod = false;
private Drawable mDrawable = null;
- private ImageViewBitmapDrawable mRecycleableBitmapDrawable = null;
+ private BitmapDrawable mRecycleableBitmapDrawable = null;
private ColorStateList mDrawableTintList = null;
private PorterDuff.Mode mDrawableTintMode = null;
private boolean mHasDrawableTint = false;
@@ -571,17 +571,6 @@ public class ImageView extends View {
}
}
- private static class ImageViewBitmapDrawable extends BitmapDrawable {
- public ImageViewBitmapDrawable(Resources res, Bitmap bitmap) {
- super(res, bitmap);
- }
-
- @Override
- public void setBitmap(Bitmap bitmap) {
- super.setBitmap(bitmap);
- }
- };
-
/**
* Sets a Bitmap as the content of this ImageView.
*
@@ -593,8 +582,7 @@ public class ImageView extends View {
// instead of doing an object reference comparison
mDrawable = null;
if (mRecycleableBitmapDrawable == null) {
- mRecycleableBitmapDrawable = new ImageViewBitmapDrawable(
- mContext.getResources(), bm);
+ mRecycleableBitmapDrawable = new BitmapDrawable(mContext.getResources(), bm);
} else {
mRecycleableBitmapDrawable.setBitmap(bm);
}