Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d508639a authored by Diego Perez's avatar Diego Perez Committed by Android (Google) Code Review
Browse files

Merge "Update layoutlib following platform change in VectorDrawable"

parents e174f143 cf200002
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
@@ -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;
        }