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

Commit ae234fc4 authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge "Delete @removed-at-birth ImageDecoder APIs" into main

parents 6565e1b3 18311bd1

core/api/removed.txt

+0 −22
Original line number Diff line number Diff line
@@ -101,28 +101,6 @@ package android.graphics { 
    field @Deprecated public static final int MATRIX_SAVE_FLAG = 1; // 0x1

  }



  public final class ImageDecoder implements java.lang.AutoCloseable {

    method @Deprecated public boolean getAsAlphaMask();

    method @Deprecated public boolean getConserveMemory();

    method @Deprecated public boolean getDecodeAsAlphaMask();

    method @Deprecated public boolean getMutable();

    method @Deprecated public boolean getRequireUnpremultiplied();

    method @Deprecated public android.graphics.ImageDecoder setAsAlphaMask(boolean);

    method @Deprecated public void setConserveMemory(boolean);

    method @Deprecated public android.graphics.ImageDecoder setDecodeAsAlphaMask(boolean);

    method @Deprecated public android.graphics.ImageDecoder setMutable(boolean);

    method @Deprecated public android.graphics.ImageDecoder setRequireUnpremultiplied(boolean);

    method @Deprecated public android.graphics.ImageDecoder setResize(int, int);

    method @Deprecated public android.graphics.ImageDecoder setResize(int);

    field @Deprecated public static final int ERROR_SOURCE_ERROR = 3; // 0x3

    field @Deprecated public static final int ERROR_SOURCE_EXCEPTION = 1; // 0x1

    field @Deprecated public static final int ERROR_SOURCE_INCOMPLETE = 2; // 0x2

  }



  @Deprecated public static class ImageDecoder.IncompleteException extends java.io.IOException {

    ctor public ImageDecoder.IncompleteException();

  }



  @Deprecated public class LayerRasterizer extends android.graphics.Rasterizer {

    ctor public LayerRasterizer();

    method public void addLayer(android.graphics.Paint, float, float);

graphics/java/android/graphics/ImageDecoder.java

+0 −125
Original line number Diff line number Diff line
@@ -681,12 +681,6 @@ public final class ImageDecoder implements AutoCloseable { 
        }

    };



    /** @removed

     * @deprecated Subsumed by {@link #DecodeException}.

     */

    @Deprecated

    public static class IncompleteException extends IOException {};



    /**

     *  Interface for changing the default settings of a decode.

     *
@@ -713,24 +707,6 @@ public final class ImageDecoder implements AutoCloseable { 


    };



    /** @removed

     * @deprecated Replaced by {@link #DecodeException#SOURCE_EXCEPTION}.

     */

    @Deprecated

    public static final int ERROR_SOURCE_EXCEPTION  = 1;



    /** @removed

     * @deprecated Replaced by {@link #DecodeException#SOURCE_INCOMPLETE}.

     */

    @Deprecated

    public static final int ERROR_SOURCE_INCOMPLETE = 2;



    /** @removed

     * @deprecated Replaced by {@link #DecodeException#SOURCE_MALFORMED_DATA}.

     */

    @Deprecated

    public static final int ERROR_SOURCE_ERROR      = 3;



    /**

     *  Information about an interrupted decode.

     */
@@ -1178,14 +1154,6 @@ public final class ImageDecoder implements AutoCloseable { 
    }



    // Modifiers

    /** @removed

     * @deprecated Renamed to {@link #setTargetSize}.

     */

    @Deprecated

    public ImageDecoder setResize(int width, int height) {

        this.setTargetSize(width, height);

        return this;

    }



    /**

     *  Specify the size of the output {@link Drawable} or {@link Bitmap}.
@@ -1217,15 +1185,6 @@ public final class ImageDecoder implements AutoCloseable { 
        mDesiredHeight = height;

    }



    /** @removed

     * @deprecated Renamed to {@link #setTargetSampleSize}.

     */

    @Deprecated

    public ImageDecoder setResize(int sampleSize) {

        this.setTargetSampleSize(sampleSize);

        return this;

    }



    private int getTargetDimension(int original, int sampleSize, int computed) {

        // Sampling will never result in a smaller size than 1.

        if (sampleSize >= original) {
@@ -1381,15 +1340,6 @@ public final class ImageDecoder implements AutoCloseable { 
        mUnpremultipliedRequired = unpremultipliedRequired;

    }



    /** @removed

     * @deprecated Renamed to {@link #setUnpremultipliedRequired}.

     */

    @Deprecated

    public ImageDecoder setRequireUnpremultiplied(boolean unpremultipliedRequired) {

        this.setUnpremultipliedRequired(unpremultipliedRequired);

        return this;

    }



    /**

     *  Return whether the {@link Bitmap} will have unpremultiplied pixels.

     */
@@ -1397,14 +1347,6 @@ public final class ImageDecoder implements AutoCloseable { 
        return mUnpremultipliedRequired;

    }



    /** @removed

     * @deprecated Renamed to {@link #isUnpremultipliedRequired}.

     */

    @Deprecated

    public boolean getRequireUnpremultiplied() {

        return this.isUnpremultipliedRequired();

    }



    /**

     *  Modify the image after decoding and scaling.

     *
@@ -1528,15 +1470,6 @@ public final class ImageDecoder implements AutoCloseable { 
        mMutable = mutable;

    }



    /** @removed

     * @deprecated Renamed to {@link #setMutableRequired}.

     */

    @Deprecated

    public ImageDecoder setMutable(boolean mutable) {

        this.setMutableRequired(mutable);

        return this;

    }



    /**

     *  Return whether the decoded {@link Bitmap} will be mutable.

     */
@@ -1544,14 +1477,6 @@ public final class ImageDecoder implements AutoCloseable { 
        return mMutable;

    }



    /** @removed

     * @deprecated Renamed to {@link #isMutableRequired}.

     */

    @Deprecated

    public boolean getMutable() {

        return this.isMutableRequired();

    }



    /**

     * Save memory if possible by using a denser {@link Bitmap.Config} at the

     * cost of some image quality.
@@ -1597,22 +1522,6 @@ public final class ImageDecoder implements AutoCloseable { 
        return mConserveMemory ? MEMORY_POLICY_LOW_RAM : MEMORY_POLICY_DEFAULT;

    }



    /** @removed

     * @deprecated Replaced by {@link #setMemorySizePolicy}.

     */

    @Deprecated

    public void setConserveMemory(boolean conserveMemory) {

        mConserveMemory = conserveMemory;

    }



    /** @removed

     * @deprecated Replaced by {@link #getMemorySizePolicy}.

     */

    @Deprecated

    public boolean getConserveMemory() {

        return mConserveMemory;

    }



    /**

     *  Specify whether to potentially treat the output as an alpha mask.

     *
@@ -1632,24 +1541,6 @@ public final class ImageDecoder implements AutoCloseable { 
        mDecodeAsAlphaMask = enabled;

    }



    /** @removed

     * @deprecated Renamed to {@link #setDecodeAsAlphaMaskEnabled}.

     */

    @Deprecated

    public ImageDecoder setDecodeAsAlphaMask(boolean enabled) {

        this.setDecodeAsAlphaMaskEnabled(enabled);

        return this;

    }



    /** @removed

     * @deprecated Renamed to {@link #setDecodeAsAlphaMaskEnabled}.

     */

    @Deprecated

    public ImageDecoder setAsAlphaMask(boolean asAlphaMask) {

        this.setDecodeAsAlphaMask(asAlphaMask);

        return this;

    }



    /**

     *  Return whether to treat single channel input as alpha.

     *
@@ -1662,22 +1553,6 @@ public final class ImageDecoder implements AutoCloseable { 
        return mDecodeAsAlphaMask;

    }



    /** @removed

     * @deprecated Renamed to {@link #isDecodeAsAlphaMaskEnabled}.

     */

    @Deprecated

    public boolean getDecodeAsAlphaMask() {

        return mDecodeAsAlphaMask;

    }



    /** @removed

     * @deprecated Renamed to {@link #isDecodeAsAlphaMaskEnabled}.

     */

    @Deprecated

    public boolean getAsAlphaMask() {

        return this.getDecodeAsAlphaMask();

    }



    /**

     * Specify the desired {@link ColorSpace} for the output.

     *