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

Commit a4d7ad86 authored by Diego Perez's avatar Diego Perez
Browse files

Fix rect shadow detection 

ViewGroup_Delegate was trying to use a rect shadow even in cases where
we needed to use a path. This caused that using a ToggleButton would
throw an exception with radius < 0.
Also, changed the tests so we can detect certain render errors and
ignore other (like known fidelity warnings).

Change-Id: I900d45f9efa892ad0aebc8f4ef73fc9f21ab9d92
parent 36712853

tools/layoutlib/bridge/src/android/view/RectShadowPainter.java

+6 −2
Original line number Diff line number Diff line
@@ -44,6 +44,11 @@ public class RectShadowPainter { 
    private static final float PERPENDICULAR_ANGLE = 90f;



    public static void paintShadow(Outline viewOutline, float elevation, Canvas canvas) {

        Rect outline = new Rect();

        if (!viewOutline.getRect(outline)) {

            throw new IllegalArgumentException("Outline is not a rect shadow");

        }



        float shadowSize = elevationToShadow(elevation);

        int saved = modifyCanvas(canvas, shadowSize);

        if (saved == -1) {
@@ -54,8 +59,7 @@ public class RectShadowPainter { 
            cornerPaint.setStyle(Style.FILL);

            Paint edgePaint = new Paint(cornerPaint);

            edgePaint.setAntiAlias(false);

            Rect outline = viewOutline.mRect;

            float radius = viewOutline.mRadius;

            float radius = viewOutline.getRadius();

            float outerArcRadius = radius + shadowSize;

            int[] colors = {START_COLOR, START_COLOR, END_COLOR};

            cornerPaint.setShader(new RadialGradient(0, 0, outerArcRadius, colors,

tools/layoutlib/bridge/src/android/view/ViewGroup_Delegate.java

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class ViewGroup_Delegate { 
    private static void drawShadow(ViewGroup parent, Canvas canvas, View child,

            Outline outline) {

        float elevation = getElevation(child, parent);

        if(outline.mRect != null) {

        if(outline.mMode == Outline.MODE_ROUND_RECT && outline.mRect != null) {

            RectShadowPainter.paintShadow(outline, elevation, canvas);

            return;

        }

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

+156 B (10.6 KiB)
Loading image diff...

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

+91 B (7.13 KiB)
Loading image diff...

tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/allwidgets.xml

+8 −0
Original line number Diff line number Diff line
@@ -197,6 +197,14 @@ 
        android:inputType="numberPassword"

        android:text="numeric password" />



    <ToggleButton

        android:id="@+id/toggleButton"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignTop="@id/editText4"

        android:layout_toEndOf="@id/editText4"

        android:text="New ToggleButton" />



    <EditText

        android:id="@id/editText5"

        android:layout_width="wrap_content"