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

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

am 2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev 

* commit '2c1a22d9':
  Make getInt in BridgeTypedArray accept empty String.
  Fix layout mirroring.
parents f76806a9 2c1a22d9

tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java

+2 −5
Original line number Diff line number Diff line
@@ -239,15 +239,12 @@ public final class BridgeTypedArray extends TypedArray { 
    public int getInt(int index, int defValue) {

        String s = getString(index);

        try {

            if (s != null) {

            return convertValueToInt(s, defValue);

            }

        } catch (NumberFormatException e) {

            Bridge.getLog().warning(LayoutLog.TAG_RESOURCES_FORMAT,

                    String.format("\"%1$s\" in attribute \"%2$s\" is not a valid integer",

                            s, mNames[index]),

                    null);

            return defValue;

        }

        return defValue;

    }
@@ -949,7 +946,7 @@ public final class BridgeTypedArray extends TypedArray { 
     * "XXXXXXXX" > 80000000.

     */

    private static int convertValueToInt(@Nullable String charSeq, int defValue) {

        if (null == charSeq)

        if (null == charSeq || charSeq.isEmpty())

            return defValue;



        int sign = 1;

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

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ class Layout extends RelativeLayout { 
        HardwareConfig hwConfig = getParams().getHardwareConfig();

        Density density = hwConfig.getDensity();

        boolean isRtl = Bridge.isLocaleRtl(getParams().getLocale());

        setLayoutDirection(isRtl? LAYOUT_DIRECTION_RTL : LAYOUT_DIRECTION_LTR);



        NavigationBar navBar = null;

        if (mBuilder.hasNavBar()) {