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

Commit c7c8c599 authored by Xavier Ducrohet's avatar Xavier Ducrohet
Browse files

Merge 67450db0 from honeycomb. Do not merge. 

Change-Id: I0ca140dd6d9279ff313f930739ad40fbbed4f335
LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
parent 5982bf66

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java

+4 −11
Original line number Diff line number Diff line
@@ -491,18 +491,11 @@ public final class BridgeTypedArray extends TypedArray { 
        if (ResourceHelper.stringToFloat(s, mValue)) {

            float f = mValue.getDimension(mBridgeResources.mMetrics);



            if (f < 0) {

                // negative values are not allowed in pixel dimensions

                Bridge.getLog().error(LayoutLog.TAG_BROKEN,

                        "Negative pixel dimension: " + s,

                        null, null /*data*/);

                return defValue;

            }



            final int res = (int)(f+0.5f);

            if (res != 0) return res;

            if (f == 0) return 0;

            if (f < 1) return 1;



            return (int)(f+0.5f);

            if (f > 0) return 1;

            return defValue; // this is basically unreachable.

        }



        // looks like we were unable to resolve the dimension value