diff options
author | John Stuppy <jstuppy@google.com> | 2013-02-04 14:30:11 -0800 |
---|---|---|
committer | John Stuppy <jstuppy@google.com> | 2013-02-04 14:32:01 -0800 |
commit | 4252a662f88e0d13829e106831d66b3f28c9cb70 (patch) | |
tree | c097215e2f46980f0f06f01339b4c325feeb63d2 | |
parent | 57c92d2246eb58caaa83649372cce387a3c66ee3 (diff) | |
download | robolectric-4252a662f88e0d13829e106831d66b3f28c9cb70.tar.gz |
Adds mm to dimen unitsandroid-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-dev
Change-Id: I8a95f2c2ed9fa2af2023866cb949a92d314f51a9
-rw-r--r-- | src/main/java/com/xtremelabs/robolectric/res/DimenResourceLoader.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/xtremelabs/robolectric/res/DimenResourceLoader.java b/src/main/java/com/xtremelabs/robolectric/res/DimenResourceLoader.java index ec32ad50c..5d08ae0de 100644 --- a/src/main/java/com/xtremelabs/robolectric/res/DimenResourceLoader.java +++ b/src/main/java/com/xtremelabs/robolectric/res/DimenResourceLoader.java @@ -3,8 +3,8 @@ package com.xtremelabs.robolectric.res; import org.w3c.dom.Node; public class DimenResourceLoader extends XpathResourceXmlLoader implements ResourceValueConverter { - private static final String[] UNITS = { "dp", "dip", "px", "sp" }; - + private static final String[] UNITS = { "dp", "dip", "px", "sp", "mm" }; + private ResourceReferenceResolver<Float> dimenResolver = new ResourceReferenceResolver<Float>("dimen"); public DimenResourceLoader(ResourceExtractor resourceExtractor) { @@ -33,7 +33,7 @@ public class DimenResourceLoader extends XpathResourceXmlLoader implements Resou end = index; } } - + return Float.parseFloat(rawValue.substring(0, end)); } } |