Move GenericRequest out of bitmap package

library/src/main/java/com/bumptech/glide/BitmapRequestBuilder.java

@@ -20,7 +20,7 @@ import com.bumptech.glide.load.resource.transcode.ResourceTranscoder;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.model.ImageVideoWrapper;
 import com.bumptech.glide.provider.LoadProvider;
-import com.bumptech.glide.request.bitmap.RequestListener;
+import com.bumptech.glide.request.RequestListener;
 
 import java.io.InputStream;
 

library/src/main/java/com/bumptech/glide/DrawableRequestBuilder.java

@@ -14,7 +14,7 @@ import com.bumptech.glide.load.resource.gifbitmap.GifBitmapWrapper;
 import com.bumptech.glide.load.resource.gifbitmap.GifBitmapWrapperTransformation;
 import com.bumptech.glide.load.resource.transcode.ResourceTranscoder;
 import com.bumptech.glide.provider.LoadProvider;
-import com.bumptech.glide.request.bitmap.RequestListener;
+import com.bumptech.glide.request.RequestListener;
 
 import java.io.InputStream;
 

library/src/main/java/com/bumptech/glide/GenericRequestBuilder.java

@@ -18,8 +18,8 @@ import com.bumptech.glide.provider.LoadProvider;
 import com.bumptech.glide.request.Request;
 import com.bumptech.glide.request.RequestCoordinator;
 import com.bumptech.glide.request.ThumbnailRequestCoordinator;
-import com.bumptech.glide.request.bitmap.GenericRequest;
-import com.bumptech.glide.request.bitmap.RequestListener;
+import com.bumptech.glide.request.GenericRequest;
+import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.target.BitmapImageViewTarget;
 import com.bumptech.glide.request.target.Target;
 

library/src/main/java/com/bumptech/glide/request/bitmap/GenericRequest.java → library/src/main/java/com/bumptech/glide/request/GenericRequest.java

-package com.bumptech.glide.request.bitmap;
+package com.bumptech.glide.request;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -15,9 +15,6 @@ import com.bumptech.glide.load.engine.Engine;
 import com.bumptech.glide.load.model.ModelLoader;
 import com.bumptech.glide.load.data.DataFetcher;
 import com.bumptech.glide.provider.LoadProvider;
-import com.bumptech.glide.request.Request;
-import com.bumptech.glide.request.RequestCoordinator;
-import com.bumptech.glide.request.ResourceCallback;
 import com.bumptech.glide.request.target.Target;
 
 import java.io.InputStream;

library/src/main/java/com/bumptech/glide/request/bitmap/RequestListener.java → library/src/main/java/com/bumptech/glide/request/RequestListener.java

-package com.bumptech.glide.request.bitmap;
+package com.bumptech.glide.request;
 
 import com.bumptech.glide.request.target.Target;
 
@@ -39,8 +39,7 @@ public interface RequestListener<T> {
     public abstract void onException(Exception e, T model, Target target);
 
     /**
-     * Called when a load completes successfully, immediately after
-     * {@link Target#onImageReady(android.graphics.Bitmap)}.
+     * Called when a load completes successfully, immediately after {@link Target#onResourceReady(Object)}.
      *
      * @param model The specific model that was used to load the image.
      * @param target The target the model was loaded into.

library/src/test/java/com/bumptech/glide/request/GenericRequestTest.java

@@ -16,7 +16,6 @@ import com.bumptech.glide.load.engine.Engine;
 import com.bumptech.glide.load.model.ModelLoader;
 import com.bumptech.glide.load.data.DataFetcher;
 import com.bumptech.glide.provider.LoadProvider;
-import com.bumptech.glide.request.bitmap.GenericRequest;
 import com.bumptech.glide.request.target.Target;
 import org.junit.Before;
 import org.junit.Test;