Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove all non-porterduff xfermodes from the public API" into nyc-dev

Browse Source
This commit is contained in:
Derek Sollenberger
2016-03-16 12:17:14 +00:00
committed by Android (Google) Code Review
parent c25c9032ff 51e7805f14
commit 7494eb2114
9 changed files with 62 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/current.txt
View File

@@ -11476,17 +11476,6 @@ package android.gesture {
package android.graphics {
public deprecated class AvoidXfermode extends android.graphics.Xfermode {
ctor public AvoidXfermode(int, int, android.graphics.AvoidXfermode.Mode);
}
public static final class AvoidXfermode.Mode extends java.lang.Enum {
method public static android.graphics.AvoidXfermode.Mode valueOf(java.lang.String);
method public static final android.graphics.AvoidXfermode.Mode[] values();
enum_constant public static final android.graphics.AvoidXfermode.Mode AVOID;
enum_constant public static final android.graphics.AvoidXfermode.Mode TARGET;
}
public final class Bitmap implements android.os.Parcelable {
method public boolean compress(android.graphics.Bitmap.CompressFormat, int, java.io.OutputStream);
method public android.graphics.Bitmap copy(android.graphics.Bitmap.Config, boolean);
@@ -12353,10 +12342,6 @@ package android.graphics {
field public int bytesPerPixel;
}
public deprecated class PixelXorXfermode extends android.graphics.Xfermode {
ctor public PixelXorXfermode(int);
}
public class Point implements android.os.Parcelable {
ctor public Point();
ctor public Point(int, int);

19
api/removed.txt
View File

@@ -35,6 +35,25 @@ package android.database {
}
package android.graphics {
public deprecated class AvoidXfermode extends android.graphics.Xfermode {
ctor public AvoidXfermode(int, int, android.graphics.AvoidXfermode.Mode);
}
public static final class AvoidXfermode.Mode extends java.lang.Enum {
method public static android.graphics.AvoidXfermode.Mode valueOf(java.lang.String);
method public static final android.graphics.AvoidXfermode.Mode[] values();
enum_constant public static final android.graphics.AvoidXfermode.Mode AVOID;
enum_constant public static final android.graphics.AvoidXfermode.Mode TARGET;
}
public deprecated class PixelXorXfermode extends android.graphics.Xfermode {
ctor public PixelXorXfermode(int);
}
}
package android.media {
public final class AudioFormat implements android.os.Parcelable {

15
api/system-current.txt
View File

@@ -11871,17 +11871,6 @@ package android.gesture {
package android.graphics {
public deprecated class AvoidXfermode extends android.graphics.Xfermode {
ctor public AvoidXfermode(int, int, android.graphics.AvoidXfermode.Mode);
}
public static final class AvoidXfermode.Mode extends java.lang.Enum {
method public static android.graphics.AvoidXfermode.Mode valueOf(java.lang.String);
method public static final android.graphics.AvoidXfermode.Mode[] values();
enum_constant public static final android.graphics.AvoidXfermode.Mode AVOID;
enum_constant public static final android.graphics.AvoidXfermode.Mode TARGET;
}
public final class Bitmap implements android.os.Parcelable {
method public boolean compress(android.graphics.Bitmap.CompressFormat, int, java.io.OutputStream);
method public android.graphics.Bitmap copy(android.graphics.Bitmap.Config, boolean);
@@ -12748,10 +12737,6 @@ package android.graphics {
field public int bytesPerPixel;
}
public deprecated class PixelXorXfermode extends android.graphics.Xfermode {
ctor public PixelXorXfermode(int);
}
public class Point implements android.os.Parcelable {
ctor public Point();
ctor public Point(int, int);

19
api/system-removed.txt
View File

@@ -33,6 +33,25 @@ package android.database {
}
package android.graphics {
public deprecated class AvoidXfermode extends android.graphics.Xfermode {
ctor public AvoidXfermode(int, int, android.graphics.AvoidXfermode.Mode);
}
public static final class AvoidXfermode.Mode extends java.lang.Enum {
method public static android.graphics.AvoidXfermode.Mode valueOf(java.lang.String);
method public static final android.graphics.AvoidXfermode.Mode[] values();
enum_constant public static final android.graphics.AvoidXfermode.Mode AVOID;
enum_constant public static final android.graphics.AvoidXfermode.Mode TARGET;
}
public deprecated class PixelXorXfermode extends android.graphics.Xfermode {
ctor public PixelXorXfermode(int);
}
}
package android.media {
public final class AudioFormat implements android.os.Parcelable {

15
api/test-current.txt
View File

@@ -11486,17 +11486,6 @@ package android.gesture {
package android.graphics {
public deprecated class AvoidXfermode extends android.graphics.Xfermode {
ctor public AvoidXfermode(int, int, android.graphics.AvoidXfermode.Mode);
}
public static final class AvoidXfermode.Mode extends java.lang.Enum {
method public static android.graphics.AvoidXfermode.Mode valueOf(java.lang.String);
method public static final android.graphics.AvoidXfermode.Mode[] values();
enum_constant public static final android.graphics.AvoidXfermode.Mode AVOID;
enum_constant public static final android.graphics.AvoidXfermode.Mode TARGET;
}
public final class Bitmap implements android.os.Parcelable {
method public boolean compress(android.graphics.Bitmap.CompressFormat, int, java.io.OutputStream);
method public android.graphics.Bitmap copy(android.graphics.Bitmap.Config, boolean);
@@ -12363,10 +12352,6 @@ package android.graphics {
field public int bytesPerPixel;
}
public deprecated class PixelXorXfermode extends android.graphics.Xfermode {
ctor public PixelXorXfermode(int);
}
public class Point implements android.os.Parcelable {
ctor public Point();
ctor public Point(int, int);

19
api/test-removed.txt
View File

@@ -35,6 +35,25 @@ package android.database {
}
package android.graphics {
public deprecated class AvoidXfermode extends android.graphics.Xfermode {
ctor public AvoidXfermode(int, int, android.graphics.AvoidXfermode.Mode);
}
public static final class AvoidXfermode.Mode extends java.lang.Enum {
method public static android.graphics.AvoidXfermode.Mode valueOf(java.lang.String);
method public static final android.graphics.AvoidXfermode.Mode[] values();
enum_constant public static final android.graphics.AvoidXfermode.Mode AVOID;
enum_constant public static final android.graphics.AvoidXfermode.Mode TARGET;
}
public deprecated class PixelXorXfermode extends android.graphics.Xfermode {
ctor public PixelXorXfermode(int);
}
}
package android.media {
public final class AudioFormat implements android.os.Parcelable {

33
core/jni/android/graphics/Xfermode.cpp
View File

@@ -15,34 +15,20 @@
*/
#include "jni.h"
#include "GraphicsJNI.h"
//#include "GraphicsJNI.h"
#include "core_jni_helpers.h"
#include "AvoidXfermode.h"
#include "SkPixelXorXfermode.h"
#include <SkXfermode.h>
namespace android {
class SkXfermodeGlue {
public:
static void finalizer(JNIEnv* env, jobject, jlong objHandle)
{
SkXfermode* obj = reinterpret_cast<SkXfermode *>(objHandle);
SkSafeUnref(obj);
}
static jlong avoid_create(JNIEnv* env, jobject, jint opColor,
jint tolerance, jint modeHandle)
{
AvoidXfermode::Mode mode = static_cast<AvoidXfermode::Mode>(modeHandle);
return reinterpret_cast<jlong>(AvoidXfermode::Create(opColor, tolerance, mode));
}
static jlong pixelxor_create(JNIEnv* env, jobject, jint opColor)
{
return reinterpret_cast<jlong>(SkPixelXorXfermode::Create(opColor));
}
};
///////////////////////////////////////////////////////////////////////////////
@@ -51,24 +37,9 @@ static const JNINativeMethod gXfermodeMethods[] = {
{"finalizer", "(J)V", (void*) SkXfermodeGlue::finalizer}
};
static const JNINativeMethod gAvoidMethods[] = {
{"nativeCreate", "(III)J", (void*) SkXfermodeGlue::avoid_create}
};
static const JNINativeMethod gPixelXorMethods[] = {
{"nativeCreate", "(I)J", (void*) SkXfermodeGlue::pixelxor_create}
};
int register_android_graphics_Xfermode(JNIEnv* env) {
android::RegisterMethodsOrDie(env, "android/graphics/Xfermode", gXfermodeMethods,
NELEM(gXfermodeMethods));
android::RegisterMethodsOrDie(env, "android/graphics/Xfermode", gXfermodeMethods,
NELEM(gXfermodeMethods));
android::RegisterMethodsOrDie(env, "android/graphics/AvoidXfermode", gAvoidMethods,
NELEM(gAvoidMethods));
android::RegisterMethodsOrDie(env, "android/graphics/PixelXorXfermode", gPixelXorMethods,
NELEM(gPixelXorMethods));
return 0;
}

6
graphics/java/android/graphics/AvoidXfermode.java
View File

@@ -19,6 +19,8 @@ package android.graphics;
/**
* AvoidXfermode xfermode will draw the src everywhere except on top of the
* opColor or, depending on the Mode, draw only on top of the opColor.
*
* @removed
*/
@Deprecated
public class AvoidXfermode extends Xfermode {
@@ -53,9 +55,5 @@ public class AvoidXfermode extends Xfermode {
if (tolerance < 0 || tolerance > 255) {
throw new IllegalArgumentException("tolerance must be 0..255");
}
native_instance = nativeCreate(opColor, tolerance, mode.nativeInt);
}
private static native long nativeCreate(int opColor, int tolerance,
int nativeMode);
}

8
graphics/java/android/graphics/PixelXorXfermode.java
View File

@@ -17,17 +17,11 @@
package android.graphics;
/**
* PixelXorXfermode implements a simple pixel xor (op ^ src ^ dst).
* This transformation does not follow premultiplied conventions, therefore
* this mode *always* returns an opaque color (alpha == 255). Thus it is
* not really usefull for operating on blended colors.
* @removed
*/
@Deprecated
public class PixelXorXfermode extends Xfermode {
public PixelXorXfermode(int opColor) {
native_instance = nativeCreate(opColor);
}
private static native long nativeCreate(int opColor);
}