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

Commit c9a98fa2 authored by Diego Perez's avatar Diego Perez Committed by android-build-merger
Browse files

Merge "Add missing translate if the drawable top is not 0,0" into nyc-dev 

am: 9aa2362f

* commit '9aa2362f':
  Add missing translate if the drawable top is not 0,0
parents 171160a3 9aa2362f

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

+14 −23
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.graphics.drawable;



import com.android.internal.R;

import com.android.layoutlib.bridge.impl.DelegateManager;

import com.android.tools.layoutlib.annotations.LayoutlibDelegate;
@@ -136,7 +135,21 @@ public class VectorDrawable_Delegate { 
        VPathRenderer_Delegate nativePathRenderer =

                getDelegate(rendererPtr);



        Canvas_Delegate.native_save(canvasWrapperPtr, MATRIX_SAVE_FLAG | CLIP_SAVE_FLAG);

        Canvas_Delegate.native_translate(canvasWrapperPtr, bounds.left, bounds.top);



        if (needsMirroring) {

            Canvas_Delegate.native_translate(canvasWrapperPtr, bounds.width(), 0);

            Canvas_Delegate.native_scale(canvasWrapperPtr, -1.0f, 1.0f);

        }



        // At this point, canvas has been translated to the right position.

        // And we use this bound for the destination rect for the drawBitmap, so

        // we offset to (0, 0);

        bounds.offsetTo(0, 0);

        nativePathRenderer.draw(canvasWrapperPtr, colorFilterPtr, bounds.width(), bounds.height());



        Canvas_Delegate.native_restore(canvasWrapperPtr, true);

    }



    @LayoutlibDelegate
@@ -492,28 +505,6 @@ public class VectorDrawable_Delegate { 
            super(copy);

        }



        public void inflate(Resources r, AttributeSet attrs, Theme theme) {

            final TypedArray a = obtainAttributes(r, theme, attrs,

                    R.styleable.VectorDrawableClipPath);

            updateStateFromTypedArray(a);

            a.recycle();

        }



        private void updateStateFromTypedArray(TypedArray a) {

            // Account for any configuration changes.

            mChangingConfigurations |= a.getChangingConfigurations();



            final String pathName = a.getString(R.styleable.VectorDrawableClipPath_name);

            if (pathName != null) {

                mPathName = pathName;

            }



            final String pathData = a.getString(R.styleable.VectorDrawableClipPath_pathData);

            if (pathData != null) {

                mNodes = PathParser_Delegate.createNodesFromPathData(pathData);

            }

        }



        @Override

        public boolean isClipPath() {

            return true;