Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/wallpapers/Basic into HEADcm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingcm-10.1

9 files changed, 39 insertions, 16 deletions

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0eac6db..ccb2b93 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -35,7 +35,7 @@
     <string name="wallpaper_clock" msgid="6555051461698958610">"Reloj polar"</string>
     <string name="wallpaper_clock_author" msgid="8779094427834551330">"Google"</string>
     <string name="wallpaper_clock_desc" msgid="6767980298898740026">"Presenta la fecha y la hora en forma de arcos en el sentido de las agujas del reloj: mes, día, hora, minuto y segundo."</string>
-    <string name="wallpaper_nexus" msgid="3789061608411260304">"Conexión"</string>
+    <string name="wallpaper_nexus" msgid="3789061608411260304">"Nexus"</string>
     <string name="wallpaper_nexus_author" msgid="8492858637541249441">"Google"</string>
     <string name="wallpaper_nexus_desc" msgid="5562598238151885905">"Un conjunto de redes neuronales"</string>
     <string name="clock_settings" msgid="7837858747417927288">"Ajustes del reloj polar"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 03594ea..b11ed6c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -25,16 +25,16 @@
     <string name="wallpaper_walkaround_desc" msgid="1714824320382778730">"از طریق گوشی خود ببینید و بدون بروز تصادفات خطرناک به اطراف حرکت کنید."</string>
     <string name="wallpaper_grass" msgid="4753389782988032116">"علف"</string>
     <string name="wallpaper_grass_author" msgid="9197652780831360471">"Google"</string>
-    <string name="wallpaper_grass_desc" msgid="7808225799564607409">"قسمت های پهن علف که در مقابل یک آسمان در شب یا روز به آرامی به صورت موجی حرکت می کنند."</string>
+    <string name="wallpaper_grass_desc" msgid="7808225799564607409">"قسمت‌های پهن علف که در مقابل یک آسمان در شب یا روز به آرامی به صورت موجی حرکت می‌کنند."</string>
     <string name="wallpaper_galaxy" msgid="4698294375306738428">"کهکشان"</string>
     <string name="wallpaper_galaxy_author" msgid="5455561260819111338">"Google"</string>
-    <string name="wallpaper_galaxy_desc" msgid="6816969378845338629">"کهکشانی متشکل از ستاره هایی که آهسته می چرخند."</string>
+    <string name="wallpaper_galaxy_desc" msgid="6816969378845338629">"کهکشانی متشکل از ستاره هایی که آهسته می‌چرخند."</string>
     <string name="wallpaper_fall" msgid="1500920940722360941">"آب"</string>
     <string name="wallpaper_fall_author" msgid="8860429843949521342">"Google"</string>
-    <string name="wallpaper_fall_desc" msgid="595888373487204297">"ریزش برگ های پاییزی&lt;br&gt; به استخر دارای آب های مواج زیر: &lt;br&gt; پس زمینه مایع"</string>
+    <string name="wallpaper_fall_desc" msgid="595888373487204297">"ریزش برگ های پاییزی&lt;br&gt; به استخر دارای آب های مواج زیر: &lt;br&gt; پس‌زمینه مایع"</string>
     <string name="wallpaper_clock" msgid="6555051461698958610">"ساعت قطبی"</string>
     <string name="wallpaper_clock_author" msgid="8779094427834551330">"Google"</string>
-    <string name="wallpaper_clock_desc" msgid="6767980298898740026">"تاریخ و زمان را به صورت کمان های در جهت عقربه های ساعت نشان می دهد: ماه، روز، ساعت، دقیقه و ثانیه"</string>
+    <string name="wallpaper_clock_desc" msgid="6767980298898740026">"تاریخ و زمان را به صورت کمان های در جهت عقربه های ساعت نشان می‌دهد: ماه، روز، ساعت، دقیقه و ثانیه"</string>
     <string name="wallpaper_nexus" msgid="3789061608411260304">"پیوند"</string>
     <string name="wallpaper_nexus_author" msgid="8492858637541249441">"Google"</string>
     <string name="wallpaper_nexus_desc" msgid="5562598238151885905">"یک نگاهی اجمالی در شبکه عصبی."</string>
@@ -43,7 +43,7 @@
     <string name="variable_line_width" msgid="8487094734462263605">"تغییر پهنای زنگ"</string>
     <string name="palette" msgid="1636154448241520718">"پالت رنگ"</string>
     <string name="palette_gray" msgid="4575370050214496017">"آهن"</string>
-    <string name="palette_violet" msgid="6124851215872884048">"نیمه شب"</string>
+    <string name="palette_violet" msgid="6124851215872884048">"نیمه‌شب"</string>
     <string name="palette_matrix" msgid="2755109999115087511">"صفحه سبز"</string>
     <string name="palette_white_c" msgid="3846812107437715188">"خرس قطبی (پویا)"</string>
     <string name="palette_black_c" msgid="1521258571661038231">"سیاهچاله (پویا)"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1851955..1ef1348 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -35,7 +35,7 @@
     <string name="wallpaper_clock" msgid="6555051461698958610">"Kutup saati"</string>
     <string name="wallpaper_clock_author" msgid="8779094427834551330">"Google"</string>
     <string name="wallpaper_clock_desc" msgid="6767980298898740026">"Saat yönünde dönen kavislerle tarihi ve saati gösterir: ay, gün, saat, dakika ve saniye."</string>
-    <string name="wallpaper_nexus" msgid="3789061608411260304">"Bağ"</string>
+    <string name="wallpaper_nexus" msgid="3789061608411260304">"Nexus"</string>
     <string name="wallpaper_nexus_author" msgid="8492858637541249441">"Google"</string>
     <string name="wallpaper_nexus_desc" msgid="5562598238151885905">"Sinirsel ağ içine bakış."</string>
     <string name="clock_settings" msgid="7837858747417927288">"Kutup saati ayarları"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e224a10..2aaa0fa 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -35,7 +35,7 @@
     <string name="wallpaper_clock" msgid="6555051461698958610">"极地时钟"</string>
     <string name="wallpaper_clock_author" msgid="8779094427834551330">"Google"</string>
     <string name="wallpaper_clock_desc" msgid="6767980298898740026">"以顺时针圆弧的形式显示日期和时间：月、日、小时、分和秒。"</string>
-    <string name="wallpaper_nexus" msgid="3789061608411260304">"线性光幕效果"</string>
+    <string name="wallpaper_nexus" msgid="3789061608411260304">"交错光幕"</string>
     <string name="wallpaper_nexus_author" msgid="8492858637541249441">"Google"</string>
     <string name="wallpaper_nexus_desc" msgid="5562598238151885905">"神经网络之一斑。"</string>
     <string name="clock_settings" msgid="7837858747417927288">"极地时钟设置"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 15630ce..369b063 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -29,13 +29,13 @@
     <string name="wallpaper_galaxy" msgid="4698294375306738428">"銀河"</string>
     <string name="wallpaper_galaxy_author" msgid="5455561260819111338">"Google"</string>
     <string name="wallpaper_galaxy_desc" msgid="6816969378845338629">"由緩慢旋轉的星星組成的銀河。"</string>
-    <string name="wallpaper_fall" msgid="1500920940722360941">"浮水"</string>
+    <string name="wallpaper_fall" msgid="1500920940722360941">"水面落葉"</string>
     <string name="wallpaper_fall_author" msgid="8860429843949521342">"Google"</string>
     <string name="wallpaper_fall_desc" msgid="595888373487204297">"秋葉飄落&lt;br&gt;池中激起漣漪：&lt;br&gt;禪意象水波背景"</string>
     <string name="wallpaper_clock" msgid="6555051461698958610">"Polar Clock"</string>
     <string name="wallpaper_clock_author" msgid="8779094427834551330">"Google"</string>
     <string name="wallpaper_clock_desc" msgid="6767980298898740026">"以順時針方向弧形顯示日期及時間：月、日、時、分以及秒。"</string>
-    <string name="wallpaper_nexus" msgid="3789061608411260304">"中樞"</string>
+    <string name="wallpaper_nexus" msgid="3789061608411260304">"Nexus"</string>
     <string name="wallpaper_nexus_author" msgid="8492858637541249441">"Google"</string>
     <string name="wallpaper_nexus_desc" msgid="5562598238151885905">"窺視神經網路內部。"</string>
     <string name="clock_settings" msgid="7837858747417927288">"Polar Clock 設定"</string>
diff --git a/src/com/android/wallpaper/RenderScriptWallpaper.java b/src/com/android/wallpaper/RenderScriptWallpaper.java
index 0016d33..fe1f21d 100644
--- a/src/com/android/wallpaper/RenderScriptWallpaper.java
+++ b/src/com/android/wallpaper/RenderScriptWallpaper.java
@@ -89,7 +89,7 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends
         @Override
         public void onOffsetsChanged(float xOffset, float yOffset,
                 float xStep, float yStep, int xPixels, int yPixels) {
-            mRenderer.setOffset(xOffset, yOffset, xPixels, yPixels);
+            if (mRenderer != null) mRenderer.setOffset(xOffset, yOffset, xPixels, yPixels);
         }
 
         @Override
@@ -110,7 +110,11 @@ public abstract class RenderScriptWallpaper<T extends RenderScriptScene> extends
         @Override
         public Bundle onCommand(String action, int x, int y, int z,
                 Bundle extras, boolean resultRequested) {
-            return mRenderer.onCommand(action, x, y, z, extras, resultRequested);
+            if (mRenderer != null) {
+                return mRenderer.onCommand(action, x, y, z, extras, resultRequested);
+            } else {
+                return null;
+            }
         }
 
     }
diff --git a/src/com/android/wallpaper/grass/grass.rs b/src/com/android/wallpaper/grass/grass.rs
index 32f0536..b03f19c 100644
--- a/src/com/android/wallpaper/grass/grass.rs
+++ b/src/com/android/wallpaper/grass/grass.rs
@@ -243,9 +243,9 @@ static void drawNight(int width, int height) {
     rsgDrawQuadTexCoords(
             0.0f, -32.0f, 0.0f,
             0.0f, 1.0f,
-            0.0f, 1024.0f - 32.0f, 0.0f,
+            0.0f, height, 0.0f,
             0.0f, 0.0f,
-            width, 1024.0f - 32.0f, 0.0f,
+            width, height, 0.0f,
             2.0f, 0.0f,
             width, -32.0f, 0.0f,
             2.0f, 1.0f);
diff --git a/src/com/android/wallpaper/nexus/NexusRS.java b/src/com/android/wallpaper/nexus/NexusRS.java
index 20b7dd3..50dab9d 100644
--- a/src/com/android/wallpaper/nexus/NexusRS.java
+++ b/src/com/android/wallpaper/nexus/NexusRS.java
@@ -44,12 +44,21 @@ class NexusRS extends RenderScriptScene {
 
     private ProgramVertexFixedFunction.Constants mPvOrthoAlloc;
 
+    private int mInitialWidth;
+    private int mInitialHeight;
+    private float mWorldScaleX;
+    private float mWorldScaleY;
     private float mXOffset;
     private ScriptC_nexus mScript;
 
     public NexusRS(int width, int height) {
         super(width, height);
 
+        mInitialWidth = width;
+        mInitialHeight = height;
+        mWorldScaleX = 1.0f;
+        mWorldScaleY = 1.0f;
+
         mOptionsARGB.inScaled = false;
         mOptionsARGB.inPreferredConfig = Bitmap.Config.ARGB_8888;
     }
@@ -70,6 +79,11 @@ class NexusRS extends RenderScriptScene {
         super.resize(width, height); // updates mWidth, mHeight
 
         // android.util.Log.d("NexusRS", String.format("resize(%d, %d)", width, height));
+
+        mWorldScaleX = (float)mInitialWidth / width;
+        mWorldScaleY = (float)mInitialHeight / height;
+        mScript.set_gWorldScaleX(mWorldScaleX);
+        mScript.set_gWorldScaleY(mWorldScaleY);
     }
 
     @Override
@@ -100,6 +114,8 @@ class NexusRS extends RenderScriptScene {
         mScript.set_gIsPreview(isPreview() ? 1 : 0);
         mScript.set_gMode(mode);
         mScript.set_gXOffset(0.f);
+        mScript.set_gWorldScaleX(mWorldScaleX);
+        mScript.set_gWorldScaleY(mWorldScaleY);
     }
 
     private Allocation loadTexture(int id) {
@@ -161,7 +177,7 @@ class NexusRS extends RenderScriptScene {
 
         if (mWidth < mHeight) {
             // nexus.rs ignores the xOffset when rotated; we shall endeavor to do so as well
-            x = (int) (x + mXOffset * mWidth);
+            x = (int) (x + mXOffset * mWidth / mWorldScaleX);
         }
 
         // android.util.Log.d("NexusRS", String.format(
diff --git a/src/com/android/wallpaper/nexus/nexus.rs b/src/com/android/wallpaper/nexus/nexus.rs
index 2db8d52..ef1788e 100644
--- a/src/com/android/wallpaper/nexus/nexus.rs
+++ b/src/com/android/wallpaper/nexus/nexus.rs
@@ -52,6 +52,8 @@ static int gWidth;
 static int gHeight;
 static int gRotate;
 
+float gWorldScaleX;
+float gWorldScaleY;
 float gXOffset;
 int gIsPreview;
 int gMode;
@@ -168,7 +170,7 @@ static void drawPulses(pulse_t * pulseSet, int setSize) {
             } else {
                  rsMatrixTranslate(&modelMatrix, -(gXOffset * gWidth), 0, 0);
             }
-            rsMatrixScale(&modelMatrix, p->scale, p->scale, 1.0f);
+            rsMatrixScale(&modelMatrix, p->scale * gWorldScaleX, p->scale * gWorldScaleY, 1.0f);
             rsgProgramVertexLoadModelMatrix(&modelMatrix);
 
            float x = p->originX + (p->dx * SPEED * delta);
@@ -305,6 +307,7 @@ int root() {
 
     rs_matrix4x4 matrix;
     rsMatrixLoadIdentity(&matrix);
+    rsMatrixScale(&matrix, gWorldScaleX, gWorldScaleY, 1.0f);
 
     if (gRotate) {
         //matrixLoadRotate(matrix, 90.0f, 0.0f, 0.0f, 1.0f);