Update for API 18

bug 7968563
New defaults for createFromBitmap

Change-Id: Iaa4568d263644345ef8c5263c7b0d22a48560f15

4 files changed, 21 insertions, 7 deletions

diff --git a/src/com/android/wallpaper/fall/FallRS.java b/src/com/android/wallpaper/fall/FallRS.java
index ab6de5f..f527e18 100644
--- a/src/com/android/wallpaper/fall/FallRS.java
+++ b/src/com/android/wallpaper/fall/FallRS.java
@@ -240,13 +240,17 @@ class FallRS extends RenderScriptScene {
     }
 
     private Allocation loadTexture(int id) {
-        final Allocation allocation = Allocation.createFromBitmapResource(mRS, mResources, id);
+        final Allocation allocation = Allocation.createFromBitmapResource(mRS, mResources, id,
+                                           Allocation.MipmapControl.MIPMAP_NONE,
+                                           Allocation.USAGE_GRAPHICS_TEXTURE);
         return allocation;
     }
 
     private Allocation loadTextureARGB(int id) {
         Bitmap b = BitmapFactory.decodeResource(mResources, id, mOptionsARGB);
-        final Allocation allocation = Allocation.createFromBitmap(mRS, b);
+        final Allocation allocation = Allocation.createFromBitmap(mRS, b,
+                                           Allocation.MipmapControl.MIPMAP_NONE,
+                                           Allocation.USAGE_GRAPHICS_TEXTURE);
         return allocation;
     }
 
diff --git a/src/com/android/wallpaper/galaxy/GalaxyRS.java b/src/com/android/wallpaper/galaxy/GalaxyRS.java
index 3f32d09..9fba820 100644
--- a/src/com/android/wallpaper/galaxy/GalaxyRS.java
+++ b/src/com/android/wallpaper/galaxy/GalaxyRS.java
@@ -135,14 +135,18 @@ class GalaxyRS extends RenderScriptScene {
     }
 
     private Allocation loadTexture(int id) {
-        final Allocation allocation = Allocation.createFromBitmapResource(mRS, mResources, id);
+        final Allocation allocation = Allocation.createFromBitmapResource(mRS, mResources, id,
+                                           Allocation.MipmapControl.MIPMAP_NONE,
+                                           Allocation.USAGE_GRAPHICS_TEXTURE);
         return allocation;
     }
 
     // TODO: Fix Allocation.createFromBitmapResource() to do this when RGBA_8888 is specified
     private Allocation loadTextureARGB(int id) {
         Bitmap b = BitmapFactory.decodeResource(mResources, id, mOptionsARGB);
-        final Allocation allocation = Allocation.createFromBitmap(mRS, b);
+        final Allocation allocation = Allocation.createFromBitmap(mRS, b,
+                                           Allocation.MipmapControl.MIPMAP_NONE,
+                                           Allocation.USAGE_GRAPHICS_TEXTURE);
         return allocation;
     }
 
diff --git a/src/com/android/wallpaper/grass/GrassRS.java b/src/com/android/wallpaper/grass/GrassRS.java
index b665aa2..30bc851 100644
--- a/src/com/android/wallpaper/grass/GrassRS.java
+++ b/src/com/android/wallpaper/grass/GrassRS.java
@@ -276,7 +276,9 @@ class GrassRS extends RenderScriptScene {
     }
 
     private Allocation loadTexture(int id) {
-        return Allocation.createFromBitmapResource(mRS, mResources, id);
+        return Allocation.createFromBitmapResource(mRS, mResources, id,
+                                           Allocation.MipmapControl.MIPMAP_NONE,
+                                           Allocation.USAGE_GRAPHICS_TEXTURE);
     }
 
     private void createProgramFragment() {
diff --git a/src/com/android/wallpaper/nexus/NexusRS.java b/src/com/android/wallpaper/nexus/NexusRS.java
index 50dab9d..c59fdef 100644
--- a/src/com/android/wallpaper/nexus/NexusRS.java
+++ b/src/com/android/wallpaper/nexus/NexusRS.java
@@ -119,12 +119,16 @@ class NexusRS extends RenderScriptScene {
     }
 
     private Allocation loadTexture(int id) {
-        return Allocation.createFromBitmapResource(mRS, mResources, id);
+        return Allocation.createFromBitmapResource(mRS, mResources, id,
+                                           Allocation.MipmapControl.MIPMAP_NONE,
+                                           Allocation.USAGE_GRAPHICS_TEXTURE);
     }
 
     private Allocation loadTextureARGB(int id) {
         Bitmap b = BitmapFactory.decodeResource(mResources, id, mOptionsARGB);
-        return Allocation.createFromBitmap(mRS, b);
+        return Allocation.createFromBitmap(mRS, b,
+                                           Allocation.MipmapControl.MIPMAP_NONE,
+                                           Allocation.USAGE_GRAPHICS_TEXTURE);
     }