From 9500dc3a19466dae5269bf337364396b0a48309c Mon Sep 17 00:00:00 2001
From: Jorge Ruesga <jorge@ruesga.com>
Date: Fri, 7 Nov 2014 01:25:20 +0100
Subject: photophase: restart lwp service on bad egl context

This patch contains some fixes for bad egl context detection and other NPE and lint fixes

Change-Id: I47c4348770dc72f768df4bea27c7817d1ec10c42
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
---
 res/layout/color_picker_pref_item.xml                  |  2 +-
 .../wallpapers/photophase/AndroidHelper.java           | 18 ++++++++++++++++++
 .../wallpapers/photophase/PhotoPhaseRenderer.java      | 18 ++++++++++++++++++
 .../photophase/preferences/ChoosePicturesFragment.java |  2 +-
 4 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/res/layout/color_picker_pref_item.xml b/res/layout/color_picker_pref_item.xml
index f299d0e..65f51b7 100644
--- a/res/layout/color_picker_pref_item.xml
+++ b/res/layout/color_picker_pref_item.xml
@@ -19,7 +19,7 @@
     android:layout_height="32dp"
     android:background="@android:color/darker_gray">
     <afzkl.development.mColorPicker.views.ColorPanelView
-        android:id="@+android:id/color_picker"
+        android:id="@+id/color_picker"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="1dp"
diff --git a/src/org/cyanogenmod/wallpapers/photophase/AndroidHelper.java b/src/org/cyanogenmod/wallpapers/photophase/AndroidHelper.java
index bf69cde..56e0563 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/AndroidHelper.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/AndroidHelper.java
@@ -17,10 +17,14 @@
 package org.cyanogenmod.wallpapers.photophase;
 
 import android.app.Activity;
+import android.app.WallpaperManager;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.provider.Settings;
+import android.os.Process;
 import android.util.DisplayMetrics;
 import android.view.ViewConfiguration;
 
@@ -109,4 +113,18 @@ public final class AndroidHelper {
         }
         return result;
     }
+
+    /**
+     * Method that restart the wallpaper
+     *
+     * @param ctx The current context
+     */
+    public static void restartWallpaper(Context ctx) {
+        // Restart the service
+        Process.killProcess(Process.myPid());
+        Intent intent = new Intent(WallpaperManager.ACTION_CHANGE_LIVE_WALLPAPER);
+        intent.putExtra(WallpaperManager.EXTRA_LIVE_WALLPAPER_COMPONENT,
+                new ComponentName(ctx, PhotoPhaseWallpaper.class));
+        ctx.startActivity(intent);
+    }
 }
diff --git a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java
index bb9ed29..9358877 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java
@@ -181,6 +181,14 @@ public class PhotoPhaseRenderer implements GLSurfaceView.Renderer {
         }
     };
 
+    private final Runnable mEGLContextWatchDog = new Runnable() {
+        @Override
+        public void run() {
+            // Restart the wallpaper
+            AndroidHelper.restartWallpaper(mContext);
+        }
+    };
+
     /**
      * Constructor of <code>PhotoPhaseRenderer<code>
      *
@@ -314,6 +322,11 @@ public class PhotoPhaseRenderer implements GLSurfaceView.Renderer {
         } else {
             mDispatcher.setRenderMode(GLSurfaceView.RENDERMODE_CONTINUOUSLY);
         }
+
+        // Set a watchdog to detect EGL bad context and restart the wallpaper
+        if (!mIsPreview) {
+            mHandler.postDelayed(mEGLContextWatchDog, 1000L);
+        }
     }
 
     /**
@@ -709,6 +722,11 @@ public class PhotoPhaseRenderer implements GLSurfaceView.Renderer {
      */
     @Override
     public void onDrawFrame(GL10 glUnused) {
+        // Remove the EGL context watchdog
+        if (!mIsPreview) {
+            mHandler.removeCallbacks(mEGLContextWatchDog);
+        }
+
         // Set the projection, view and model
         GLES20.glViewport(0, -mStatusBarHeight, mWidth, mHeight);
         Matrix.setLookAtM(mVMatrix, 0, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f);
diff --git a/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java
index f83c392..fa9c637 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/ChoosePicturesFragment.java
@@ -478,7 +478,7 @@ public class ChoosePicturesFragment extends PreferenceFragment
     private void restoreData() {
         // Restore and the albums the selection
         mSelectedAlbums = new HashSet<String>(mOriginalSelectedAlbums);
-        int count = mAlbums.size();
+        int count = Math.min(mAlbums.size(), mOriginalAlbums.size());
         for (int i = 0; i < count ; i++) {
             Album album = mAlbums.get(i);
             Album originalAlbum = mOriginalAlbums.get(i);
-- 
cgit v1.2.3


From fe7d751cbf9c6167b81b09f885726c72aaf783d6 Mon Sep 17 00:00:00 2001
From: Jorge Ruesga <jorge@ruesga.com>
Date: Fri, 7 Nov 2014 20:59:29 +0100
Subject: photophase: bump version (1.0.11)

Change-Id: Id63b9b10878c4bdb0739289aa23e60d043b4041f
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
---
 AndroidManifest.xml |  4 ++--
 res/raw/changelog   | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 81eb93d..dbac663 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.cyanogenmod.wallpapers.photophase"
-    android:versionCode="1010"
-    android:versionName="1.0.8"
+    android:versionCode="1013"
+    android:versionName="1.0.11"
     android:installLocation="auto">
 
     <original-package android:name="org.cyanogenmod.wallpapers.photophase" />
diff --git a/res/raw/changelog b/res/raw/changelog
index a13eb89..a4261c1 100644
--- a/res/raw/changelog
+++ b/res/raw/changelog
@@ -1,3 +1,20 @@
+v1.0.11
+----------------------------
+- Restart wallpaper if a bad egl context is detected
+- Minor bug fixes
+- Updated translations
+
+v1.0.10
+----------------------------
+- Revert etc1 compression feature
+- Fix incorrect French string translation
+
+v1.0.9
+----------------------------
+- Use compressed etc1 textures if is supported to reduce memory footprint
+- Allow to choose more than one minute in transition intervals
+- Update translations
+
 v1.0.8
 ----------------------------
 - Fixed a memory leak bug
-- 
cgit v1.2.3


From 535d7bf7dbd1921229720834503f2ddf9c7882ac Mon Sep 17 00:00:00 2001
From: Jorge Ruesga <jorge@ruesga.com>
Date: Sun, 9 Nov 2014 01:20:16 +0100
Subject: photophase: make lwp to survive a reboot

The latest egl watchdog kill the app before they started. Increase the timeout
to make the wallpaper to survive a device reboot

Change-Id: I59a746fb9d599e0d016e4fc87c79d2a7d03a53d8
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
---
 src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java
index 9358877..e189e87 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java
@@ -325,7 +325,7 @@ public class PhotoPhaseRenderer implements GLSurfaceView.Renderer {
 
         // Set a watchdog to detect EGL bad context and restart the wallpaper
         if (!mIsPreview) {
-            mHandler.postDelayed(mEGLContextWatchDog, 1000L);
+            mHandler.postDelayed(mEGLContextWatchDog, 15000L);
         }
     }
 
-- 
cgit v1.2.3


From 0ca39c11901f7d1dc8ad4377cdc65a329baea00d Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Mon, 10 Nov 2014 03:50:04 +0200
Subject: Automatic translation import

Change-Id: I657b1763891267e42d6b563e990539d701ed4071
---
 res/values-az/strings.xml     | 56 +++++++++++++++++++++++++++++++++++++++++++
 res/values-zh-rHK/strings.xml |  2 ++
 2 files changed, 58 insertions(+)

diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 864c5be..11e7fe8 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -39,6 +39,7 @@
   <string name="pref_general_settings_wallpaper_dim">Divar kağızı tutqunluğu</string>
   <string name="pref_general_settings_background_color">Arxa plan rəngi</string>
   <string name="pref_general_settings_background_color_summary">Arxa plan rəngini tənzimlə</string>
+  <string name="pref_general_touch_action">Toxunuş hərəkəti</string>
   <string name="pref_general_touch_action_summary_format">Bir çərçivəyə toxunduğunuzda <xliff:g id="action_summary">%1$s</xliff:g></string>
   <string name="pref_general_aspect_ratio_correction">Tərəflərin nisbəti</string>
   <string name="pref_general_aspect_ratio_correction_summary">Şəkilin çərçivəyə yerləşməsi üçün kəsərək tərəflərin nisbətini nisbətini düzəltməyə çalışır</string>
@@ -52,6 +53,33 @@
   <string name="pref_media">Media</string>
   <string name="pref_media_summary">Göstəriləcək albom, yeniləmə intervalı və digər media tənzimlənmələri</string>
   <string name="pref_media_settings">Tənzimləmələr</string>
+  <string name="pref_media_settings_refresh_interval">Yeniləmə aralığı</string>
+  <string name="pref_media_settings_refresh_interval_disable">Yeni şəkil axtarışı bağlıdır</string>
+  <string name="pref_media_settings_refresh_interval_summary">Hər <xliff:g id="interval">%1$s</xliff:g> ərzində yeni şəkil axtarar</string>
+  <string name="pref_media_settings_refresh_now">İndi yenilə</string>
+  <string name="pref_media_settings_refresh_now_summary">Şəkil verilənlər bazasını əllə yeniləyər</string>
+  <string name="pref_media_pictures">Şəkillər</string>
+  <string name="pref_media_albums">Albomlar</string>
+  <string name="pref_media_albums_summary">Divar kağızında göstəriləcək albom və şəkilləri tənzimləyər</string>
+  <string name="pref_media_auto_select_new">Albomları avtomatik seçin</string>
+  <string name="pref_media_auto_select_new_summary">Media elementleri tapılarkən yeni albomları avtomatik seçər</string>
+  <string name="pref_layout">Nizam</string>
+  <string name="pref_layout_summary">Şəkillərin ekranda yerləşdirilməsi</string>
+  <string name="pref_layout_disposition">Nizamlama</string>
+  <string name="pref_random_dispositions">Təsadüfi</string>
+  <string name="pref_random_dispositions_summary">Seçilən aralıqda təsadüfi nizamlamalar yarat</string>
+  <string name="pref_random_dispositions_interval">Aralıq</string>
+  <string name="pref_disposition_portrait">Portret nizamlaması</string>
+  <string name="pref_disposition_landscape">Mənzərə nizamlaması</string>
+  <plurals name="pref_disposition_summary_format">
+    <item quantity="one"><xliff:g id="orientation">%2$s</xliff:g> \'də 1 şəkil göstərilir</item>
+    <item quantity="other"><xliff:g id="orientation">%2$s</xliff:g> \'də <xliff:g id="count">%1$d</xliff:g> şəkil göstərilir</item>
+  </plurals>
+  <string name="disposition_orientation_portrait">şaquli yerləşmə</string>
+  <string name="disposition_orientation_landscape">üfüqi yerləşmə</string>
+  <string name="pref_disposition_description">Çərçivəyə uzun toxunun və kənarlarını dartıb \u0026 buraxın. Müəyyən şablonları göstərmək üçün sola və ya sağa sürüşdürün</string>
+  <string name="pref_disposition_template">Şablon <xliff:g id="number_of_template">%1$s</xliff:g> / <xliff:g id="total_of_templates">%2$s</xliff:g></string>
+  <string name="pref_disposition_unable_delete_advise">Seçilən çərçivə silinə bilmədi</string>
   <string name="pref_about">Haqqında</string>
   <string name="pref_about_summary">PhotoPhase v<xliff:g id="version">%1$s</xliff:g>\nMüəlliflik hüququ \u00A9 2014 The CyanogenMod Layihəsi</string>
   <string name="refresh_intervals_disabled">Bağlı</string>
@@ -65,15 +93,43 @@
   <string name="touch_actions_open">Aç</string>
   <string name="touch_actions_share">Paylaş</string>
   <string name="touch_actions_none_summary">Heç birşey etməz</string>
+  <string name="touch_actions_transition_summary">Şəkil keçidi tətəbiq olunur</string>
+  <string name="touch_actions_open_summary">Şəkili aç</string>
+  <string name="touch_actions_share_summary">Şəkili paylaş</string>
+  <string name="transitions_cube">Kub</string>
+  <string name="transitions_fade">Soluqdur</string>
+  <string name="transitions_flip">Çevir</string>
+  <string name="transitions_swap">Əvəzetmə</string>
   <string name="transitions_translation">Tərcümə</string>
   <string name="transitions_window">Pəncərə</string>
   <string name="effects_noeffect">Normal</string>
   <string name="effects_autofix">Avtomatik nizamla</string>
   <string name="effects_blur">Bulanıq</string>
+  <string name="effects_crossprocess">Çarpaz proses</string>
   <string name="effects_documentary">Sənədli</string>
   <string name="effects_duotone">Cüt ton</string>
+  <string name="effects_emboss">Qabart</string>
+  <string name="effects_fisheye">Balıq gözü</string>
+  <string name="effects_glow">Parlaq</string>
+  <string name="effects_grain">Dənə</string>
+  <string name="effects_grayscale">Boz çaları</string>
+  <string name="effects_halftone">Yarım ton</string>
+  <string name="effects_lomoish">Lomo-ish</string>
+  <string name="effects_mirror">Güzgü</string>
+  <string name="effects_negative">Neqativ</string>
+  <string name="effects_outline">Kontur</string>
+  <string name="effects_pixelate">Pikselləşdir</string>
   <string name="effects_popart">Pop art</string>
   <string name="effects_posterize">Posterləşdir</string>
   <string name="effects_saturate">Doymuş</string>
+  <string name="effects_scanlines">Sətir pikseli</string>
+  <string name="effects_sepia">Sepia</string>
+  <string name="effects_temperature">İstilik</string>
+  <string name="effects_tint">Rəng tonu</string>
+  <string name="effects_vignette">Səhnəcik</string>
+  <string name="color_picker_alpha_slider_text">Alfa</string>
+  <string name="color_picker_current_text">Hazırki:</string>
+  <string name="color_picker_new_text">Yeni:</string>
+  <string name="color_picker_color">Rəng:</string>
   <string name="changelog_title">Dəyişiklik qeydi</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 97f5b96..57dda39 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -19,5 +19,7 @@
   <string name="app_description">PhotoPhase 動態牆紙</string>
   <string name="pref_general_settings_wallpaper_dim">牆紙朦朧</string>
   <string name="pref_general_aspect_ratio_correction_summary">嘗試修復圖片的縱橫比透過裁剪以適合目標幀</string>
+  <string name="pref_media_summary">專輯顯示、重新整理間隔和其他媒體設定</string>
+  <string name="effects_scanlines">掃描綫</string>
   <string name="changelog_title">更新日誌</string>
 </resources>
-- 
cgit v1.2.3