summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@google.com>2009-12-04 14:47:03 -0500
committerDaniel Sandler <dsandler@google.com>2009-12-04 14:47:03 -0500
commitc1d449d071703d3c2b8c4d9961e812b4632b5c90 (patch)
treee58d72ec61a5317bca8d98eb80d8f41857b81e9a
parent630cb4aa77ef52c15295b0ffb4b9ec966b516fa7 (diff)
downloadandroid_packages_apps_DeskClock-c1d449d071703d3c2b8c4d9961e812b4632b5c90.tar.gz
android_packages_apps_DeskClock-c1d449d071703d3c2b8c4d9961e812b4632b5c90.tar.bz2
android_packages_apps_DeskClock-c1d449d071703d3c2b8c4d9961e812b4632b5c90.zip
Fix http://b/2305223 (DO NOT MERGE)
When placed into night mode (dim mode), the DeskClock must restore full brightness any time the user returns to it from another activity. There are two reasons for this: 1. The other activity won't be dim, so it's sort of jarring to return to an almost-black screen. 2. As indicated in bug 2305223, visiting another activity is a useful way to restore the display if it's so dark that you can't see it to find the nightmode toggle button (e.g., ambient lighting is very bright).
-rw-r--r--src/com/android/deskclock/DeskClock.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index fb7ce00cb..3cfcc38d7 100644
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java
@@ -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