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

Merge "Update layoutlib following platform change in VectorDrawable"

Browse Source
This commit is contained in:
Diego Perez
2016-06-27 10:40:31 +00:00
committed by Android (Google) Code Review
parent e174f1431c cf2000020e
commit d508639a58
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/layoutlib/bridge/src/android/graphics/drawable/VectorDrawable_Delegate.java
View File

@@ -95,6 +95,14 @@ public class VectorDrawable_Delegate {
return sPathManager.addNewDelegate(new VPathRenderer_Delegate(rootGroup));
}
@LayoutlibDelegate
static long nCreateTreeFromCopy(long rendererToCopyPtr, long rootGroupPtr) {
VGroup_Delegate rootGroup = VNativeObject.getDelegate(rootGroupPtr);
VPathRenderer_Delegate rendererToCopy = VNativeObject.getDelegate(rendererToCopyPtr);
return sPathManager.addNewDelegate(new VPathRenderer_Delegate(rendererToCopy,
rootGroup));
}
@LayoutlibDelegate
static void nSetRendererViewportSize(long rendererPtr, float viewportWidth,
float viewportHeight) {
@@ -1035,6 +1043,14 @@ public class VectorDrawable_Delegate {
mRenderPath = new Path();
}
private VPathRenderer_Delegate(VPathRenderer_Delegate rendererToCopy,
VGroup_Delegate rootGroup) {
this(rootGroup);
mViewportWidth = rendererToCopy.mViewportWidth;
mViewportHeight = rendererToCopy.mViewportHeight;
mRootAlpha = rendererToCopy.mRootAlpha;
}
private float getRootAlpha() {
return mRootAlpha;
}