Remove deprecated support for retrieving dimension resources
diff --git a/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java b/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
index e674593..8d9322d 100644
--- a/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
+++ b/src/main/java/com/xtremelabs/robolectric/res/ResourceLoader.java
@@ -5,7 +5,6 @@
import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
-import android.graphics.drawable.NinePatchDrawable;
import android.preference.PreferenceScreen;
import android.view.Menu;
import android.view.View;
@@ -64,12 +63,6 @@
private final Set<Integer> ninePatchDrawableIds = new HashSet<Integer>();
- // TODO: get these value from the xml resources instead [xw 20101011]
- /**
- * @deprecated
- */
- public final Map< Integer, Integer > dimensions = new HashMap< Integer, Integer >();
-
public ResourceLoader( int sdkVersion, Class rClass, File resourceDir, File assetsDir ) throws Exception {
this.sdkVersion = sdkVersion;
this.assetsDir = assetsDir;
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResources.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResources.java
index 1482727..82bde5a 100644
--- a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResources.java
+++ b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowResources.java
@@ -176,12 +176,6 @@
@Implementation
public float getDimension(int id) throws Resources.NotFoundException {
- // todo: get this value from the xml resources and scale it by display metrics [xw 20101011]
- // TODO: The fall-through implementation now gets value from XML resources. resourceLoader.dimensions should be deprecated
- if (resourceLoader.dimensions.containsKey(id)) {
- return resourceLoader.dimensions.get(id);
- }
-
return resourceLoader.getDimenValue(id);
}
@@ -214,17 +208,6 @@
return newInstanceOf(Resources.Theme.class);
}
- /**
- * Non-Android accessor that sets the value to be returned by {@link #getDimension(int)}
- *
- * @param id ID to set the dimension for
- * @param value value to be returned
- * @deprecated
- */
- public void setDimension(int id, int value) {
- resourceLoader.dimensions.put(id, value);
- }
-
@Implements(Resources.Theme.class)
public static class ShadowTheme {
@Implementation
