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

Commit 349f1487 authored by Leon Scroggins's avatar Leon Scroggins Committed by Android (Google) Code Review
Browse files

Merge "Deprecate createFromResourceStream with BitmapFactory.Options"

parents b5bca1dc 5de17526

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -14603,7 +14603,7 @@ package android.graphics.drawable { 
    method public final android.graphics.Rect copyBounds();

    method public static android.graphics.drawable.Drawable createFromPath(java.lang.String);

    method public static android.graphics.drawable.Drawable createFromResourceStream(android.content.res.Resources, android.util.TypedValue, java.io.InputStream, java.lang.String);

    method public static android.graphics.drawable.Drawable createFromResourceStream(android.content.res.Resources, android.util.TypedValue, java.io.InputStream, java.lang.String, android.graphics.BitmapFactory.Options);

    method public static deprecated android.graphics.drawable.Drawable createFromResourceStream(android.content.res.Resources, android.util.TypedValue, java.io.InputStream, java.lang.String, android.graphics.BitmapFactory.Options);

    method public static android.graphics.drawable.Drawable createFromStream(java.io.InputStream, java.lang.String);

    method public static android.graphics.drawable.Drawable createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;

    method public static android.graphics.drawable.Drawable createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;

graphics/java/android/graphics/drawable/Drawable.java

+2 −0
Original line number Diff line number Diff line
@@ -1171,6 +1171,8 @@ public abstract class Drawable { 
    /**

     * Create a drawable from an inputstream, using the given resources and

     * value to determine density information.

     *

     * @deprecated Prefer the version without an Options object.

     */

    public static Drawable createFromResourceStream(Resources res, TypedValue value,

            InputStream is, String srcName, BitmapFactory.Options opts) {