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

Commit cd23df6a authored by Chris Craik's avatar Chris Craik
Browse files

Deprecate color array drawBitmap methods 

Change-Id: I3339214ddaa7a32e9ddbbb1a074fa98e393eaadf
parent e731a4ed

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -9652,8 +9652,8 @@ package android.graphics { 
    method public void drawBitmap(android.graphics.Bitmap, float, float, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.RectF, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.Rect, android.graphics.Paint);

    method public void drawBitmap(int[], int, int, float, float, int, int, boolean, android.graphics.Paint);

    method public void drawBitmap(int[], int, int, int, int, int, int, boolean, android.graphics.Paint);

    method public deprecated void drawBitmap(int[], int, int, float, float, int, int, boolean, android.graphics.Paint);

    method public deprecated void drawBitmap(int[], int, int, int, int, int, int, boolean, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Matrix, android.graphics.Paint);

    method public void drawBitmapMesh(android.graphics.Bitmap, int, int, float[], int, int[], int, android.graphics.Paint);

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

graphics/java/android/graphics/Canvas.java

+16 −3
Original line number Diff line number Diff line
@@ -1221,7 +1221,13 @@ public class Canvas { 
     *                 values. If false, the alpha byte is ignored (assumed to

     *                 be 0xFF for every pixel).

     * @param paint  May be null. The paint used to draw the bitmap

     *

     * @deprecated Usage with a {@link #isHardwareAccelerated() hardware accelerated} canvas

     * requires an internal copy of color buffer contents every time this method is called. Using a

     * Bitmap avoids this copy, and allows the application to more explicitly control the lifetime

     * and copies of pixel data.

     */

    @Deprecated

    public void drawBitmap(int[] colors, int offset, int stride, float x, float y,

            int width, int height, boolean hasAlpha, Paint paint) {

        // check for valid input
@@ -1249,8 +1255,15 @@ public class Canvas { 
                paint != null ? paint.mNativePaint : 0);

    }



    /** Legacy version of drawBitmap(int[] colors, ...) that took ints for x,y

    /**

     * Legacy version of drawBitmap(int[] colors, ...) that took ints for x,y

     *

     * @deprecated Usage with a {@link #isHardwareAccelerated() hardware accelerated} canvas

     * requires an internal copy of color buffer contents every time this method is called. Using a

     * Bitmap avoids this copy, and allows the application to more explicitly control the lifetime

     * and copies of pixel data.

     */

    @Deprecated

    public void drawBitmap(int[] colors, int offset, int stride, int x, int y,

            int width, int height, boolean hasAlpha, Paint paint) {

        // call through to the common float version