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

Commit 33bdfe75 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

am df776b76: am d985e3b6: Merge changes... 

am df776b76: am d985e3b6: Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev

* commit 'df776b76':
  Revert to using AppTheme for LayoutLib tests.
  Fix Matrix_Delegate.native_getValues()
  Update test image for upated nav icons.
  Fix typo: s/FullScreen/Fullscreen/ in LayoutLib.
  Fix bugs introduced in 78aa664b.
parents b1e54abd df776b76

tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java

+1 −1
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ public final class Matrix_Delegate { 
            return;

        }



        System.arraycopy(d.mValues, 0, d.mValues, 0, MATRIX_SIZE);

        System.arraycopy(d.mValues, 0, values, 0, MATRIX_SIZE);

    }



    @LayoutlibDelegate

tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java

+8 −9
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import java.awt.geom.PathIterator; 
import java.awt.geom.Point2D;

import java.awt.geom.Rectangle2D;

import java.awt.geom.RoundRectangle2D;

import java.util.ArrayList;



/**

 * Delegate implementing the native methods of android.graphics.Path
@@ -504,13 +503,13 @@ public final class Path_Delegate { 
            switch (type) {

                case PathIterator.SEG_MOVETO:

                case PathIterator.SEG_LINETO:

                    store(coords, tmp, 1, isFirstPoint);

                    store(tmp, coords, 1, isFirstPoint);

                    break;

                case PathIterator.SEG_QUADTO:

                    store(coords, tmp, 2, isFirstPoint);

                    store(tmp, coords, 2, isFirstPoint);

                    break;

                case PathIterator.SEG_CUBICTO:

                    store(coords, tmp, 3, isFirstPoint);

                    store(tmp, coords, 3, isFirstPoint);

                    break;

                case PathIterator.SEG_CLOSE:

                    // No points returned.
@@ -528,14 +527,14 @@ public final class Path_Delegate { 


    private static void store(float[] src, float[] dst, int count, boolean isFirst) {

        if (isFirst) {

            dst[0] = 0;

            dst[1] = src[0];

            dst[2] = src[1];

            dst[0] = 0;       // fraction

            dst[1] = src[0];  // abscissa

            dst[2] = src[1];  // ordinate

        }

        if (count > 1 || !isFirst) {

            dst[3] = 1;

            dst[4] = src[2 * count];

            dst[5] = src[2 * count + 1];

            dst[4] = src[2 * count - 2];

            dst[5] = src[2 * count - 1];

        }

    }

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Layout.java

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ class Layout extends RelativeLayout { 
    // Theme attributes used for configuring appearance of the system decor.

    private static final String ATTR_WINDOW_FLOATING = "windowIsFloating";

    private static final String ATTR_WINDOW_BACKGROUND = "windowBackground";

    private static final String ATTR_WINDOW_FULL_SCREEN = "windowFullScreen";

    private static final String ATTR_WINDOW_FULL_SCREEN = "windowFullscreen";

    private static final String ATTR_NAV_BAR_HEIGHT = "navigation_bar_height";

    private static final String ATTR_NAV_BAR_WIDTH = "navigation_bar_width";

    private static final String ATTR_STATUS_BAR_HEIGHT = "status_bar_height";

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

−4.49 KiB (5.07 KiB)
Loading image diff...

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

−70 B (566 B)
Loading image diff...