Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e3ccb70 authored by Leon Scroggins's avatar Leon Scroggins Committed by android-build-merger
Browse files

Merge "Add ImageDecoder.Source for resources" into pi-dev 

am: d65f5ed0

Change-Id: I4b69423bb54ca34161a7b4f98d1c87c427139660
parents a809ae38 d65f5ed0

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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);

























graphics/java/android/graphics/ImageDecoder.java



+2
−5




























Original line number
Diff line number
Diff line








@@ -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);















    }