diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-29 15:05:03 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-01-29 15:05:03 +0000 |
| commit | 40582000e078361d2e5995abdf25f923fa656e86 (patch) | |
| tree | befd76c22753b25a3afa11aeb3a00b20928bfceb /tools/layoutlib | |
| parent | d4ccffd3ba7f7c27ddfc56231cf7f2424842b1e3 (diff) | |
| download | frameworks_base-40582000e078361d2e5995abdf25f923fa656e86.zip frameworks_base-40582000e078361d2e5995abdf25f923fa656e86.tar.gz frameworks_base-40582000e078361d2e5995abdf25f923fa656e86.tar.bz2 | |
Fix a few more delegate methods in layoutlib.
Change-Id: Icd7069452b9ac66498af69ec705d12c3acd1c848
Diffstat (limited to 'tools/layoutlib')
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java index 04ce9d0..f5c4677 100644 --- a/tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java @@ -151,13 +151,13 @@ import java.util.Set; } @LayoutlibDelegate - /*package*/ static Bitmap nativeDecodeAsset(int asset, Rect padding, Options opts) { + /*package*/ static Bitmap nativeDecodeAsset(long asset, Rect padding, Options opts) { opts.inBitmap = null; return null; } @LayoutlibDelegate - /*package*/ static Bitmap nativeDecodeAsset(int asset, Rect padding, Options opts, + /*package*/ static Bitmap nativeDecodeAsset(long asset, Rect padding, Options opts, boolean applyScale, float scale) { opts.inBitmap = null; return null; diff --git a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java index ba771dd..3111f0d 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java @@ -786,7 +786,7 @@ public final class Canvas_Delegate { } @LayoutlibDelegate - /*package*/ static void native_drawPath(long nativeCanvas, int path, long paint) { + /*package*/ static void native_drawPath(long nativeCanvas, long path, long paint) { final Path_Delegate pathDelegate = Path_Delegate.getDelegate(path); if (pathDelegate == null) { return; diff --git a/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java index 1d66586..ebfe9bc 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java @@ -654,7 +654,7 @@ public final class Matrix_Delegate { } @LayoutlibDelegate - /*package*/ static boolean native_invert(long native_object, int inverse) { + /*package*/ static boolean native_invert(long native_object, long inverse) { Matrix_Delegate d = sManager.getDelegate(native_object); if (d == null) { return false; |