Merge "Add ImageDecoder.Source for resources" into pi-dev
diff --git a/api/current.txt b/api/current.txt
index 308b80b..78a3e5ab 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -13610,6 +13610,7 @@
public final class ImageDecoder implements java.lang.AutoCloseable {
method public void close();
+ method public static android.graphics.ImageDecoder.Source createSource(android.content.res.Resources, int);
method public static android.graphics.ImageDecoder.Source createSource(android.content.ContentResolver, android.net.Uri);
method public static android.graphics.ImageDecoder.Source createSource(java.nio.ByteBuffer);
method public static android.graphics.ImageDecoder.Source createSource(java.io.File);
diff --git a/graphics/java/android/graphics/ImageDecoder.java b/graphics/java/android/graphics/ImageDecoder.java
index 88701fa..8196d66 100644
--- a/graphics/java/android/graphics/ImageDecoder.java
+++ b/graphics/java/android/graphics/ImageDecoder.java
@@ -24,7 +24,6 @@
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
-import android.annotation.RawRes;
import android.content.ContentResolver;
import android.content.res.AssetFileDescriptor;
import android.content.res.AssetManager.AssetInputStream;
@@ -543,17 +542,15 @@
}
/**
- * Create a new {@link Source} from an asset.
- * @hide
+ * Create a new {@link Source} from a resource.
*
* @param res the {@link Resources} object containing the image data.
* @param resId resource ID of the image data.
- * // FIXME: Can be an @DrawableRes?
* @return a new Source object, which can be passed to
* {@link #decodeDrawable} or {@link #decodeBitmap}.
*/
@NonNull
- public static Source createSource(@NonNull Resources res, @RawRes int resId)
+ public static Source createSource(@NonNull Resources res, int resId)
{
return new ResourceSource(res, resId);
}