Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 67450db0 from honeycomb. Do not merge.

Browse Source 
Change-Id: I0ca140dd6d9279ff313f930739ad40fbbed4f335
LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
This commit is contained in:
Xavier Ducrohet
2011-03-17 14:11:23 -07:00
parent 5982bf66d4
commit c7c8c599a6
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java
View File

@@ -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