diff options
author | Christian Williams <christianw@google.com> | 2017-11-08 13:57:51 -0800 |
---|---|---|
committer | Christian Williams <christianw@google.com> | 2017-11-08 13:58:22 -0800 |
commit | b1395158301f403803944690613d7a3c9d49c3eb (patch) | |
tree | d8575d651f41ee2f3123447d6c6cad5c370e6be1 /resources/src/main/java | |
parent | c80995689d9c0c4160084944262816b728fe93bc (diff) | |
download | robolectric-shadows-b1395158301f403803944690613d7a3c9d49c3eb.tar.gz |
Improve handling of dpi.
Qualifiers 'anydpi' and 'nodpi' are illegal in @Config.
If no density qualifier is specified, default to 'mdpi'.
Fixed tests.
Diffstat (limited to 'resources/src/main/java')
-rw-r--r-- | resources/src/main/java/org/robolectric/res/ResBundle.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/resources/src/main/java/org/robolectric/res/ResBundle.java b/resources/src/main/java/org/robolectric/res/ResBundle.java index a7b516bbc..3fba20ea0 100644 --- a/resources/src/main/java/org/robolectric/res/ResBundle.java +++ b/resources/src/main/java/org/robolectric/res/ResBundle.java @@ -1,5 +1,6 @@ package org.robolectric.res; +import com.google.common.base.Strings; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -32,7 +33,10 @@ public class ResBundle { if (values == null || values.size() == 0) return null; ResTable_config toMatch = new ResTable_config(); - new ConfigDescription().parse(qualifiersStr == null ? "" : qualifiersStr, toMatch); + if (!Strings.isNullOrEmpty(qualifiersStr) && !new ConfigDescription() + .parse(qualifiersStr, toMatch)) { + throw new IllegalArgumentException("Invalid qualifiers \"" + qualifiersStr + "\""); + } TypedResource bestMatchSoFar = null; for (TypedResource candidate : values) { |