Avoid referencing resource names within Resource Loader

Author: benjaminRomano

library/src/main/java/com/bumptech/glide/load/model/ResourceLoader.java

@@ -52,9 +52,7 @@ private Uri getResourceUri(Integer model) {
               + "://"
               + resources.getResourcePackageName(model)
               + '/'
-              + resources.getResourceTypeName(model)
-              + '/'
-              + resources.getResourceEntryName(model));
+              + model);
     } catch (Resources.NotFoundException e) {
       if (Log.isLoggable(TAG, Log.WARN)) {
         Log.w(TAG, "Received invalid resource id: " + model, e);

library/test/src/test/java/com/bumptech/glide/load/model/ResourceLoaderTest.java

@@ -49,7 +49,7 @@ public void setUp() {
   @Test
   public void testCanHandleId() {
     int id = android.R.drawable.star_off;
-    Uri contentUri = Uri.parse("android.resource://android/drawable/star_off");
+    Uri contentUri = Uri.parse("android.resource://android/" + String.valueOf(id));
     when(uriLoader.buildLoadData(eq(contentUri), anyInt(), anyInt(), any(Options.class)))
         .thenReturn(new ModelLoader.LoadData<>(key, fetcher));