option to disable screensaver

Change-Id: I84bfe8203452035d75269d210c71cb9015437648

12 files changed, 21 insertions, 8 deletions

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9448125dd..1484bce6d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -144,6 +144,7 @@
       <item>15 Minuten</item>
       <item>30 Minuten</item>
       <item>60 Minuten</item>
+      <item>@string/never</item>
     </string-array>
 
     <!-- Setting title for screensaver time color picker general title-->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index bac956c47..c91dc2fdb 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -145,6 +145,7 @@
       <item>15 minuti</item>
       <item>30 minuti</item>
       <item>60 minuti</item>
+      <item>@string/never</item>
     </string-array>
 
     <!-- Setting title for screensaver time color picker general title-->
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 6dd43f2a4..63e483910 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -130,6 +130,7 @@
       <item>15 分</item>
       <item>30 分</item>
       <item>60 分</item>
+      <item>@string/never</item>
     </string-array>
 
     <!-- Setting title for screensaver time color picker general title-->
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 645e901b1..75f2f8771 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -144,6 +144,7 @@
       <item>15 Minuten</item>
       <item>30 Minuten</item>
       <item>60 Minuten</item>
+      <item>@string/never</item>
     </string-array>
 
     <!-- Setting title for screensaver time color picker general title-->
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index fc5722e5e..f5884dbda 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -284,6 +284,7 @@
       <item>15 minutos</item>
       <item>30 minutos</item>
       <item>60 minutos</item>
+      <item>@string/never</item>
     </string-array>
 
     <!-- Setting title for screensaver time color picker general title-->
@@ -309,4 +310,4 @@
     <string name="use_dual_mode_button_on">Premir continuamente no botão snooze para desligar o alarme</string>
     <string name="use_dual_mode_button_off">Separar botões snooze e desligar</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 2f8d4c99f..e7f124ff6 100755
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -132,6 +132,7 @@
       <item>15 minutos</item>
       <item>30 minutos</item>
       <item>60 minutos</item>
+      <item>@string/never</item>
     </string-array>
 
     <!-- Setting title for screensaver time color picker general title-->
@@ -158,4 +159,4 @@
     <string name="application_none">Nenhuma</string>
     <string name="alarm_alert_snooze_text_dual_mode">Soneca (segure para cancelar)</string>
     <string name="alarm_limit_title">Máxima duração do alarme</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 912f1e838..0988c0d80 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -123,6 +123,7 @@
       <item>15 минут</item>
       <item>30 минут</item>
       <item>60 минут</item>
+      <item>@string/never</item>
     </string-array>
     <string name="color_picker">Цвет времени</string>
     <string name="color_picker_title">Цвет времени (Заставка)</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c13bb4f79..bb4b8a12a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -123,6 +123,7 @@
       <item>15 minuter</item>
       <item>30 minuter</item>
       <item>60 minuter</item>
+      <item>@string/never</item>
     </string-array>
     <string name="color_picker">Färg på tid</string>
     <string name="color_picker_title">Färg på tid (skärmsläckare)</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f6190b9ae..54bbfbe43 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -149,6 +149,7 @@
       <item>15 分钟</item>
       <item>30 分钟</item>
       <item>60 分钟</item>
+      <item>@string/never</item>
     </string-array>
 
     <!-- Setting title for screensaver time color picker general title-->
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index bed0bd062..d680042e3 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -290,6 +290,7 @@
       <item>15 分鐘</item>
       <item>30 分鐘</item>
       <item>60 分鐘</item>
+      <item>@string/never</item>
     </string-array>
 
     <!-- Setting title for screensaver time color picker general title-->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4edfec7cd..5ef76f099 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -314,6 +314,7 @@
       <item>15 minutes</item>
       <item>30 minutes</item>
       <item>60 minutes</item>
+      <item>@string/never</item>
     </string-array>
 
     <!-- Values that are retrieved from the ListPreference. These must match
@@ -325,6 +326,7 @@
       <item>15</item>
       <item>30</item>
       <item>60</item>
+      <item>-1</item>
     </string-array>
 
     <!-- Setting title for screensaver time color picker general title-->
diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index 3206e38a2..22fcff635 100644
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java
@@ -286,12 +286,13 @@ public class DeskClock extends Activity {
     	String screensaver_timeout = PreferenceManager.getDefaultSharedPreferences(this)
     	.getString(SettingsActivity.SCREENSAVER_TIMEOUT, SCREEN_SAVER_TIMEOUT_DEFAULT);
     	Long timeout = (Long.parseLong(screensaver_timeout)) * 60 * 1000;
-    	
-        // reschedule screen saver
-        mHandy.removeMessages(SCREEN_SAVER_TIMEOUT_MSG);
-        mHandy.sendMessageDelayed(
-            Message.obtain(mHandy, SCREEN_SAVER_TIMEOUT_MSG),
-            timeout);
+        if (timeout > 0) {
+            // reschedule screen saver
+            mHandy.removeMessages(SCREEN_SAVER_TIMEOUT_MSG);
+            mHandy.sendMessageDelayed(
+                Message.obtain(mHandy, SCREEN_SAVER_TIMEOUT_MSG),
+                timeout);
+        }
     }
 
     private void restoreScreen() {