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

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

Merge "Incorporate alpha attribute when painting VectorDrawable"

parents 2e540390 301d4684

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -1133,7 +1133,8 @@ public class VectorDrawable_Delegate { 
                    }

                    }





                    final Paint fillPaint = mFillPaint;

                    final Paint fillPaint = mFillPaint;

                    fillPaint.setColor(applyAlpha(fullPath.mFillColor, fullPath.mFillAlpha));

                    fillPaint.setColor(applyAlpha(applyAlpha(fullPath.mFillColor, fullPath

                      .mFillAlpha), getRootAlpha()));

                    Paint_Delegate fillPaintDelegate = Paint_Delegate.getDelegate(fillPaint

                    Paint_Delegate fillPaintDelegate = Paint_Delegate.getDelegate(fillPaint

                            .getNativeInstance());

                            .getNativeInstance());

                    // mFillPaint can not be null at this point so we will have a delegate

                    // mFillPaint can not be null at this point so we will have a delegate
@@ -1162,7 +1163,8 @@ public class VectorDrawable_Delegate { 
                    }

                    }





                    strokePaint.setStrokeMiter(fullPath.mStrokeMiterlimit);

                    strokePaint.setStrokeMiter(fullPath.mStrokeMiterlimit);

                    strokePaint.setColor(applyAlpha(fullPath.mStrokeColor, fullPath.mStrokeAlpha));

                    strokePaint.setColor(applyAlpha(applyAlpha(fullPath.mStrokeColor, fullPath

                      .mStrokeAlpha), getRootAlpha()));

                    Paint_Delegate strokePaintDelegate = Paint_Delegate.getDelegate(strokePaint

                    Paint_Delegate strokePaintDelegate = Paint_Delegate.getDelegate(strokePaint

                            .getNativeInstance());

                            .getNativeInstance());

                    // mStrokePaint can not be null at this point so we will have a delegate

                    // mStrokePaint can not be null at this point so we will have a delegate

tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/vector_drawable.png

−85 B (5.74 KiB)
Loading image diff...

tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/drawable/multi_path.xml

+3 −2
Original line number Original line Diff line number Diff line
@@ -4,7 +4,8 @@ 
        android:height="76dp"

        android:height="76dp"

        android:width="76dp"

        android:width="76dp"

        android:viewportHeight="48"

        android:viewportHeight="48"

        android:viewportWidth="48">

        android:viewportWidth="48"

        android:alpha="0.6">





    <group

    <group

        android:name="root"

        android:name="root"
@@ -79,7 +80,7 @@ 
            android:fillType="nonZero"

            android:fillType="nonZero"

            android:strokeWidth="1"

            android:strokeWidth="1"

            android:strokeColor="#AABBCC"

            android:strokeColor="#AABBCC"

            android:fillColor="#AAEFCC"

            android:fillColor="#40AAEFCC"

            android:pathData="M0,-40 l0, 10 l10, 0 l0, -10 l-10,0 m5,0 l0, 10 l10, 0 l0, -10 l-10,0"

            android:pathData="M0,-40 l0, 10 l10, 0 l0, -10 l-10,0 m5,0 l0, 10 l10, 0 l0, -10 l-10,0"

        />

        />

    </group>

    </group>