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

Commit cf200002 authored by Jerome Gaillard's avatar Jerome Gaillard Committed by Diego Perez
Browse files

Update layoutlib following platform change in VectorDrawable 

Commit 02802973 copies tree properties when mutating a vector
drawable. Layoutlib does the same.

Bug: 28974071
Change-Id: I5075b35e517df4ce32a91e2926d9caa02a0c2606
(cherry picked from commit 5ee73b3466090828acdc87fffd95247b6ace6440)
parent 4a1bd499

tools/layoutlib/bridge/src/android/graphics/drawable/VectorDrawable_Delegate.java

+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;

        }