am 44c3bfe2: am a405d7d1: Merge change I0a8adab9 into eclair

Merge commit '44c3bfe294da8063f817c80b1f311e101a220b09' into eclair-mr2-plus-aosp

* commit '44c3bfe294da8063f817c80b1f311e101a220b09':
  Reduce screen saver delay to 5 min.

diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index 53c1ff4..d47e02e 100644 (file)
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java
@@ -100,7 +100,7 @@ public class DeskClock extends Activity {
     private final long QUERY_WEATHER_DELAY = 5 * 60 * 1000; // 5 min
 
     // Delay before engaging the burn-in protection mode (green-on-black).
-    private final long SCREEN_SAVER_TIMEOUT = 10 * 60 * 1000; // 10 min
+    private final long SCREEN_SAVER_TIMEOUT = 5* 60 * 1000; // 10 min
 
     // Repositioning delay in screen saver.
     private final long SCREEN_SAVER_MOVE_DELAY = 60 * 1000; // 1 min