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

Commit 89b3f48f authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

Merge "Enable changing properties of layer paint" into jb-mr1-dev

parents c0be8c85 d15ebf25

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -25028,6 +25028,7 @@ package android.view { 
    method public void setId(int);

    method public void setImportantForAccessibility(int);

    method public void setKeepScreenOn(boolean);

    method public void setLayerPaint(android.graphics.Paint);

    method public void setLayerType(int, android.graphics.Paint);

    method public void setLayoutDirection(int);

    method public void setLayoutParams(android.view.ViewGroup.LayoutParams);

core/java/android/view/GLES20Canvas.java

+4 −7
Original line number Diff line number Diff line
@@ -152,6 +152,8 @@ class GLES20Canvas extends HardwareCanvas { 
    static native int nCreateLayer(int width, int height, boolean isOpaque, int[] layerInfo);

    static native void nResizeLayer(int layerId, int width, int height, int[] layerInfo);

    static native void nSetOpaqueLayer(int layerId, boolean isOpaque);

    static native void nSetLayerPaint(int layerId, int nativePaint);

    static native void nSetLayerColorFilter(int layerId, int nativeColorFilter);

    static native void nUpdateTextureLayer(int layerId, int width, int height, boolean opaque,

            SurfaceTexture surface);

    static native void nSetTextureLayerTransform(int layerId, int matrix);
@@ -394,13 +396,8 @@ class GLES20Canvas extends HardwareCanvas { 
    

    void drawHardwareLayer(HardwareLayer layer, float x, float y, Paint paint) {

        final GLES20Layer glLayer = (GLES20Layer) layer;

        int modifier = paint != null ? setupColorFilter(paint) : MODIFIER_NONE;

        try {

        final int nativePaint = paint == null ? 0 : paint.mNativePaint;

        nDrawLayer(mRenderer, glLayer.getLayer(), x, y, nativePaint);

        } finally {

            if (modifier != MODIFIER_NONE) nResetModifiers(mRenderer, modifier);

        }

    }



    private static native void nDrawLayer(int renderer, int layer, float x, float y, int paint);

core/java/android/view/GLES20Layer.java

+10 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
package android.view;



import android.graphics.Bitmap;

import android.graphics.Paint;



/**

 * An OpenGL ES 2.0 implementation of {@link HardwareLayer}.
@@ -42,6 +43,15 @@ abstract class GLES20Layer extends HardwareLayer { 
        return mLayer;

    }



    @Override

    void setLayerPaint(Paint paint) {

        if (paint != null) {

            GLES20Canvas.nSetLayerPaint(mLayer, paint.mNativePaint);

            GLES20Canvas.nSetLayerColorFilter(mLayer, paint.getColorFilter() != null ?

                    paint.getColorFilter().nativeColorFilter : 0);

        }

    }



    @Override

    boolean copyInto(Bitmap bitmap) {

        return GLES20Canvas.nCopyLayer(mLayer, bitmap.mNativeBitmap);

core/java/android/view/HardwareLayer.java

+9 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.view; 
import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.Matrix;

import android.graphics.Paint;

import android.graphics.Rect;



/**
@@ -61,6 +62,14 @@ abstract class HardwareLayer { 
        mOpaque = isOpaque;

    }



    /**

     * Update the paint used when drawing this layer.

     *

     * @param paint The paint used when the layer is drawn into the destination canvas.

     * @see View#setLayerPaint(android.graphics.Paint)

     */

    void setLayerPaint(Paint paint) {}



    /**

     * Returns the minimum width of the layer.

     *

core/java/android/view/TextureView.java

+1 −0
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ public class TextureView extends View { 
            if (mListener != null && !mUpdateSurface) {

                mListener.onSurfaceTextureAvailable(mSurface, getWidth(), getHeight());

            }

            mLayer.setLayerPaint(mLayerPaint);

        }



        if (mUpdateSurface) {