Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Add ImageDecoder.Source for resources" into pi-dev am: d65f5ed038" into pi-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2018-03-19 21:41:19 +00:00
committed by Android (Google) Code Review
parent a3c96c1524 4e3ccb709f
commit 84474dbe76
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -13610,6 +13610,7 @@ package android.graphics {
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);

7
graphics/java/android/graphics/ImageDecoder.java
View File

@@ -24,7 +24,6 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
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 @@ public final class ImageDecoder implements AutoCloseable {
}
/**
* 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);
}