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

am c65e0c95: Merge "Fix a few more delegate methods in layoutlib."

Browse Source 
* commit 'c65e0c95c855de4505a320b6dcd66df5397c88d5':
  Fix a few more delegate methods in layoutlib.
This commit is contained in:
Narayan Kamath
2014-01-30 01:37:41 -08:00
committed by Android Git Automerger
parent 3dfa15c49b c65e0c95c8
commit cb7cdd5053
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/layoutlib/bridge/src/android/graphics/BitmapFactory_Delegate.java
View File

@@ -151,13 +151,13 @@ import java.util.Set;
} }
@LayoutlibDelegate @LayoutlibDelegate
/*package*/ static Bitmap nativeDecodeAsset(int asset, Rect padding, Options opts) { /*package*/ static Bitmap nativeDecodeAsset(long asset, Rect padding, Options opts) {
opts.inBitmap = null; opts.inBitmap = null;
return null; return null;
} }
@LayoutlibDelegate @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) { boolean applyScale, float scale) {
opts.inBitmap = null; opts.inBitmap = null;
return null; return null;

2
tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java
View File

@@ -786,7 +786,7 @@ public final class Canvas_Delegate {
} }
@LayoutlibDelegate @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); final Path_Delegate pathDelegate = Path_Delegate.getDelegate(path);
if (pathDelegate == null) { if (pathDelegate == null) {
return; return;

2
tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java
View File

@@ -654,7 +654,7 @@ public final class Matrix_Delegate {
} }
@LayoutlibDelegate @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); Matrix_Delegate d = sManager.getDelegate(native_object);
if (d == null) { if (d == null) {
return false; return false;