diff options
| author | Derek Sollenberger <djsollen@google.com> | 2014-02-12 18:10:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-12 18:10:21 +0000 |
| commit | 5f97e9e9ed2a6da22a6ed90b8db11052dd6a8cd7 (patch) | |
| tree | 21b17ef167bc63f99f8e12cd3e2dd593c6fcbe9e /core/java | |
| parent | 44bb4e9cd51b6ea114465f74a725455500be130c (diff) | |
| parent | e889298cd6ae1fc0d76bc00d7d12586db03eb261 (diff) | |
| download | frameworks_base-5f97e9e9ed2a6da22a6ed90b8db11052dd6a8cd7.zip frameworks_base-5f97e9e9ed2a6da22a6ed90b8db11052dd6a8cd7.tar.gz frameworks_base-5f97e9e9ed2a6da22a6ed90b8db11052dd6a8cd7.tar.bz2 | |
Merge "Refactor setting an SkPaint onto a hwui Layer."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/HardwareLayer.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/view/HardwareLayer.java b/core/java/android/view/HardwareLayer.java index 9bbcf7c..cb63c09 100644 --- a/core/java/android/view/HardwareLayer.java +++ b/core/java/android/view/HardwareLayer.java @@ -66,8 +66,7 @@ final class HardwareLayer { * @see View#setLayerPaint(android.graphics.Paint) */ public void setLayerPaint(Paint paint) { - nSetLayerPaint(mFinalizer.mDeferredUpdater, paint.mNativePaint, - paint.getColorFilter() != null ? paint.getColorFilter().native_instance : 0); + nSetLayerPaint(mFinalizer.mDeferredUpdater, paint.mNativePaint); } /** @@ -250,7 +249,7 @@ final class HardwareLayer { private static native void nDestroyLayerUpdater(long layerUpdater); private static native boolean nPrepare(long layerUpdater, int width, int height, boolean isOpaque); - private static native void nSetLayerPaint(long layerUpdater, long paint, long colorFilter); + private static native void nSetLayerPaint(long layerUpdater, long paint); private static native void nSetTransform(long layerUpdater, long matrix); private static native void nSetSurfaceTexture(long layerUpdater, SurfaceTexture surface, boolean isAlreadyAttached); |