am 7e827aca: (-s ours) Show a long dash instead of 0° if no temperature is available...

[android-x86/packages-apps-DeskClock.git] / src / com / android / deskclock / DeskClock.java

diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index 625f03f..3cfcc38 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
@@ -540,7 +540,10 @@ public class DeskClock extends Activity {
         am.setRepeating(AlarmManager.RTC, today.getTimeInMillis(), AlarmManager.INTERVAL_DAY, mMidnightIntent);
         registerReceiver(mIntentReceiver, filter);
 
-        doDim(false); // un-dim when resuming
+        // un-dim when resuming
+        mDimmed = false;
+        doDim(false);
+
         restoreScreen(); // disable screen saver
         refreshAll(); // will schedule periodic weather fetch