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

Merge "Update Path and RenderNode delegates to new API" into nyc-dev

Browse Source
This commit is contained in:
Diego Perez
2016-04-04 12:22:20 +00:00
committed by Android (Google) Code Review
parent faec9eb76c 8f43dfef2b
commit 18e7e10f67
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java
View File

@@ -423,21 +423,13 @@ public final class Path_Delegate {
}
@LayoutlibDelegate
/*package*/ static void native_offset(long nPath, float dx, float dy, long dst_path) {
/*package*/ static void native_offset(long nPath, float dx, float dy) {
Path_Delegate pathDelegate = sManager.getDelegate(nPath);
if (pathDelegate == null) {
return;
}
// could be null if the int is 0;
Path_Delegate dstDelegate = sManager.getDelegate(dst_path);
pathDelegate.offset(dx, dy, dstDelegate);
}
@LayoutlibDelegate
/*package*/ static void native_offset(long nPath, float dx, float dy) {
native_offset(nPath, dx, dy, 0);
pathDelegate.offset(dx, dy);
}
@LayoutlibDelegate
@@ -860,21 +852,14 @@ public final class Path_Delegate {
*
* @param dx The amount in the X direction to offset the entire path
* @param dy The amount in the Y direction to offset the entire path
* @param dst The translated path is written here. If this is null, then
* the original path is modified.
*/
public void offset(float dx, float dy, Path_Delegate dst) {
public void offset(float dx, float dy) {
GeneralPath newPath = new GeneralPath();
PathIterator iterator = mPath.getPathIterator(new AffineTransform(0, 0, dx, 0, 0, dy));
newPath.append(iterator, false /*connect*/);
if (dst != null) {
dst.mPath = newPath;
} else {
mPath = newPath;
}
mPath = newPath;
}
/**

2
tools/layoutlib/bridge/src/android/view/RenderNode_Delegate.java
View File

@@ -55,7 +55,7 @@ public class RenderNode_Delegate {
private String mName;
@LayoutlibDelegate
/*package*/ static long nCreate(String name) {
/*package*/ static long nCreate(RenderNode thisRenderNode, String name) {
RenderNode_Delegate renderNodeDelegate = new RenderNode_Delegate();
renderNodeDelegate.mName = name;
return sManager.addNewDelegate(renderNodeDelegate);