diff options
author | Deepanshu Gupta <deepanshu@google.com> | 2014-02-18 12:50:34 -0800 |
---|---|---|
committer | Deepanshu Gupta <deepanshu@google.com> | 2014-02-18 13:08:07 -0800 |
commit | 98f33350b10106cda14543700a6c46032a590bb1 (patch) | |
tree | 580a60214873745376dbc85d27da8399396b18bf | |
parent | 0ed25174f98fe473990b1d3298540117d8158e93 (diff) | |
download | frameworks_base-98f33350b10106cda14543700a6c46032a590bb1.zip frameworks_base-98f33350b10106cda14543700a6c46032a590bb1.tar.gz frameworks_base-98f33350b10106cda14543700a6c46032a590bb1.tar.bz2 |
Fix native methods
Fix native method signatures as changed by the following commits:
56f57ccbd4fbbf4d572cc966d1cb76d7ae7ad334
76d3a1b8d035d27bc80b0f2fc480a903bd001514
Change-Id: I5db31d3665a5e8c84c107cf84ec3bd5ccfb9a9fe
5 files changed, 1 insertions, 34 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/ColorFilter_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/ColorFilter_Delegate.java index 38174f1..bf03a5e 100644 --- a/tools/layoutlib/bridge/src/android/graphics/ColorFilter_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/ColorFilter_Delegate.java @@ -56,7 +56,7 @@ public abstract class ColorFilter_Delegate { // ---- native methods ---- @LayoutlibDelegate - /*package*/ static void destroyFilter(long native_instance, long nativeColorFilter) { + /*package*/ static void destroyFilter(long native_instance) { sManager.removeJavaReferenceFor(native_instance); } diff --git a/tools/layoutlib/bridge/src/android/graphics/ColorMatrixColorFilter_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/ColorMatrixColorFilter_Delegate.java index ca8f450..9aac2bd 100644 --- a/tools/layoutlib/bridge/src/android/graphics/ColorMatrixColorFilter_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/ColorMatrixColorFilter_Delegate.java @@ -60,11 +60,5 @@ public class ColorMatrixColorFilter_Delegate extends ColorFilter_Delegate { return sManager.addNewDelegate(newDelegate); } - @LayoutlibDelegate - /*package*/ static long nColorMatrixFilter(long nativeFilter, float[] array) { - // pass - return 0; - } - // ---- Private delegate/helper methods ---- } diff --git a/tools/layoutlib/bridge/src/android/graphics/LightingColorFilter_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/LightingColorFilter_Delegate.java index defaac3..501d55c 100644 --- a/tools/layoutlib/bridge/src/android/graphics/LightingColorFilter_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/LightingColorFilter_Delegate.java @@ -60,11 +60,5 @@ public class LightingColorFilter_Delegate extends ColorFilter_Delegate { return sManager.addNewDelegate(newDelegate); } - @LayoutlibDelegate - /*package*/ static int nCreateLightingFilter(long nativeFilter, int mul, int add) { - // pass - return 0; - } - // ---- Private delegate/helper methods ---- } diff --git a/tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java index 49f314c..77468ec 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java @@ -490,20 +490,6 @@ public final class Path_Delegate { return new float[0]; } - @LayoutlibDelegate - /*package*/ static long native_trim(long nPath, long nTargetPath, long nPathMeasure, - float trimStart, float trimEnd, float trimOffset) { - // TODO: add trim. - Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED, "Path.trim() not supported", null); - return nPathMeasure; - - } - - @LayoutlibDelegate - private static void native_destroyMeasure(long nPathMeasure) { - // Do nothing. - } - // ---- Private helper methods ---- private void set(Path_Delegate delegate) { diff --git a/tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java index 6049919..1bc3033 100644 --- a/tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java @@ -60,12 +60,5 @@ public class PorterDuffColorFilter_Delegate extends ColorFilter_Delegate { return sManager.addNewDelegate(newDelegate); } - @LayoutlibDelegate - /*package*/ static long nCreatePorterDuffFilter(long nativeFilter, int srcColor, - int porterDuffMode) { - // pass - return 0; - } - // ---- Private delegate/helper methods ---- } |