Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2

Android 4.3 release 2.1

7 files changed, 24 insertions, 10 deletions

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 90c946d..6f5b67c 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -20,7 +20,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="wallpapers" msgid="7890805662847963863">"Android Live ልጥፎች"</string>
-    <string name="wallpaper_walkaround" msgid="5548084303782181478">"ጠለቅ ብለህ እይ"</string>
+    <string name="wallpaper_walkaround" msgid="5548084303782181478">"ጠለቅ ብለው ይመልከቱ"</string>
     <string name="wallpaper_walkaround_author" msgid="7292960549371044078">"Google"</string>
     <string name="wallpaper_walkaround_desc" msgid="1714824320382778730">"በስልክዎ ውስጥ ጠለቅ ብለው ይመልከቱ፤ ለአደጋ ሳይጋለጡ ይጓዙ።"</string>
     <string name="wallpaper_grass" msgid="4753389782988032116">"ሣር"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 5d91f26..2ce86d0 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wallpapers" msgid="7890805662847963863">"Empaperats dinàmics d\'Android"</string>
+    <string name="wallpapers" msgid="7890805662847963863">"Fons de pantalla animats d\'Android"</string>
     <string name="wallpaper_walkaround" msgid="5548084303782181478">"Transparent"</string>
     <string name="wallpaper_walkaround_author" msgid="7292960549371044078">"Google"</string>
     <string name="wallpaper_walkaround_desc" msgid="1714824320382778730">"Feu que el telèfon sigui transparent i camineu sense arriscar-vos a patir accidents."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index ea336d1..bb29ca2 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wallpapers" msgid="7890805662847963863">"Imagens de fundo activas do Android"</string>
+    <string name="wallpapers" msgid="7890805662847963863">"Imagens de fundo ativas do Android"</string>
     <string name="wallpaper_walkaround" msgid="5548084303782181478">"Transparente"</string>
     <string name="wallpaper_walkaround_author" msgid="7292960549371044078">"Google"</string>
     <string name="wallpaper_walkaround_desc" msgid="1714824320382778730">"Veja através do seu telefone e ande sem o risco de acidentes."</string>
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);
     }