Change BitmapRequestKey to be more cleanly implementable.

Change-Id: I831586688605e6c6c2f2f7a879c6be23175f71de

1 files changed, 8 insertions, 8 deletions

diff --git a/src/com/android/bitmap/drawable/BasicBitmapDrawable.java b/src/com/android/bitmap/drawable/BasicBitmapDrawable.java
index b16618b..2aa6011 100644
--- a/src/com/android/bitmap/drawable/BasicBitmapDrawable.java
+++ b/src/com/android/bitmap/drawable/BasicBitmapDrawable.java
@@ -27,7 +27,7 @@ import android.util.Log;
 
 import com.android.bitmap.BitmapCache;
 import com.android.bitmap.DecodeTask;
-import com.android.bitmap.DecodeTask.Request;
+import com.android.bitmap.RequestKey;
 import com.android.bitmap.ReusableBitmap;
 import com.android.bitmap.util.BitmapUtils;
 import com.android.bitmap.util.RectUtils;
@@ -47,7 +47,7 @@ import java.util.concurrent.TimeUnit;
 public class BasicBitmapDrawable extends Drawable implements DecodeTask.DecodeCallback,
         Drawable.Callback {
 
-    private BitmapRequestKey mCurrKey;
+    private RequestKey mCurrKey;
     private ReusableBitmap mBitmap;
     private final BitmapCache mCache;
     private DecodeTask mTask;
@@ -81,7 +81,7 @@ public class BasicBitmapDrawable extends Drawable implements DecodeTask.DecodeCa
         mPaint.setFilterBitmap(true);
     }
 
-    public DecodeTask.Request getKey() {
+    public RequestKey getKey() {
         return mCurrKey;
     }
 
@@ -98,11 +98,11 @@ public class BasicBitmapDrawable extends Drawable implements DecodeTask.DecodeCa
         setImage(null);
     }
 
-    public void bind(BitmapRequestKey key) {
+    public void bind(RequestKey key) {
         setImage(key);
     }
 
-    private void setImage(final BitmapRequestKey key) {
+    private void setImage(final RequestKey key) {
         if (mCurrKey != null && mCurrKey.equals(key)) {
             return;
         }
@@ -201,10 +201,10 @@ public class BasicBitmapDrawable extends Drawable implements DecodeTask.DecodeCa
     }
 
     @Override
-    public void onDecodeBegin(final Request key) { }
+    public void onDecodeBegin(final RequestKey key) { }
 
     @Override
-    public void onDecodeComplete(final Request key, final ReusableBitmap result) {
+    public void onDecodeComplete(final RequestKey key, final ReusableBitmap result) {
         if (key.equals(mCurrKey)) {
             setBitmap(result);
         } else {
@@ -217,7 +217,7 @@ public class BasicBitmapDrawable extends Drawable implements DecodeTask.DecodeCa
     }
 
     @Override
-    public void onDecodeCancel(final Request key) { }
+    public void onDecodeCancel(final RequestKey key) { }
 
     private void setBitmap(ReusableBitmap bmp) {
         if (mBitmap != null && mBitmap != bmp) {