Improve handling of dpi.

Qualifiers 'anydpi' and 'nodpi' are illegal in @Config.
If no density qualifier is specified, default to 'mdpi'.
Fixed tests.

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) {