OSDN Git Service

Re-schedule screen saver mode when returning to normal.
[android-x86/packages-apps-DeskClock.git] / src / com / android / deskclock / DeskClock.java
index cb544d3..cfb599e 100644 (file)
@@ -17,7 +17,9 @@
 package com.android.deskclock;
 
 import android.app.Activity;
+import android.app.AlarmManager;
 import android.app.AlertDialog;
+import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -28,6 +30,7 @@ import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.Cursor;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
@@ -35,13 +38,17 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.SystemClock;
+import android.os.PowerManager;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.text.format.DateFormat;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View.OnClickListener;
 import android.view.View.OnCreateContextMenuListener;
@@ -49,12 +56,16 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
+import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
+import android.view.animation.TranslateAnimation;
+import android.widget.AbsoluteLayout;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -64,29 +75,58 @@ import static android.os.BatteryManager.BATTERY_STATUS_UNKNOWN;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.text.DateFormat;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.Locale;
+import java.util.Random;
 
 /**
  * DeskClock clock view for desk docks.
  */
 public class DeskClock extends Activity {
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
 
     private static final String LOG_TAG = "DeskClock";
 
-    private static final String MUSIC_NOW_PLAYING_ACTIVITY = "com.android.music.PLAYBACK_VIEWER";
+    // Package ID of the music player.
+    private static final String MUSIC_PACKAGE_ID = "com.android.music";
 
-    private final long FETCH_WEATHER_DELAY = 5 * 60 * 1000; // 5 min.
-    private final int FETCH_WEATHER_DATA_MSG = 10000;
-    private final int UPDATE_WEATHER_DISPLAY_MSG = 10001;
+    // Alarm action for midnight (so we can update the date display).
+    private static final String ACTION_MIDNIGHT = "com.android.deskclock.MIDNIGHT";
 
+    // Interval between polls of the weather widget. Its refresh period is
+    // likely to be much longer (~3h), but we want to pick up any changes
+    // within 5 minutes.
+    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 = 5* 60 * 1000; // 10 min
+
+    // Repositioning delay in screen saver.
+    private final long SCREEN_SAVER_MOVE_DELAY = 60 * 1000; // 1 min
+
+    // Color to use for text & graphics in screen saver mode.
+    private final int SCREEN_SAVER_COLOR = 0xFF308030;
+    private final int SCREEN_SAVER_COLOR_DIM = 0xFF183018;
+
+    // Opacity of black layer between clock display and wallpaper.
+    private final float DIM_BEHIND_AMOUNT_NORMAL = 0.4f;
+    private final float DIM_BEHIND_AMOUNT_DIMMED = 0.7f; // higher contrast when display dimmed
+
+    // Internal message IDs.
+    private final int QUERY_WEATHER_DATA_MSG     = 0x1000;
+    private final int UPDATE_WEATHER_DISPLAY_MSG = 0x1001;
+    private final int SCREEN_SAVER_TIMEOUT_MSG   = 0x2000;
+    private final int SCREEN_SAVER_MOVE_MSG      = 0x2001;
+
+    // Weather widget query information.
     private static final String GENIE_PACKAGE_ID = "com.google.android.apps.genie.geniewidget";
     private static final String WEATHER_CONTENT_AUTHORITY = GENIE_PACKAGE_ID + ".weather";
     private static final String WEATHER_CONTENT_PATH = "/weather/current";
     private static final String[] WEATHER_CONTENT_COLUMNS = new String[] {
             "location",
             "timestamp",
+            "temperature",
             "highTemperature",
             "lowTemperature",
             "iconUrl",
@@ -94,30 +134,42 @@ public class DeskClock extends Activity {
             "description",
         };
 
+    private static final String ACTION_GENIE_REFRESH = "com.google.android.apps.genie.REFRESH";
+
+    // State variables follow.
     private DigitalClock mTime;
     private TextView mDate;
 
     private TextView mNextAlarm = null;
     private TextView mBatteryDisplay;
 
-    private TextView mWeatherTemperature;
+    private TextView mWeatherCurrentTemperature;
+    private TextView mWeatherHighTemperature;
+    private TextView mWeatherLowTemperature;
     private TextView mWeatherLocation;
     private ImageView mWeatherIcon;
 
-    private String mWeatherTemperatureString;
+    private String mWeatherCurrentTemperatureString;
+    private String mWeatherHighTemperatureString;
+    private String mWeatherLowTemperatureString;
     private String mWeatherLocationString;
     private Drawable mWeatherIconDrawable;
 
     private Resources mGenieResources = null;
 
     private boolean mDimmed = false;
+    private boolean mScreenSaverMode = false;
+
+    private String mDateFormat;
 
-    private DateFormat mDateFormat;
-    
-    private int mBatteryLevel;
-    private boolean mPluggedIn;
+    private int mBatteryLevel = -1;
+    private boolean mPluggedIn = false;
 
-    private boolean mWeatherFetchScheduled = false;
+    private boolean mLaunchedFromDock = false;
+
+    private Random mRNG;
+
+    private PendingIntent mMidnightIntent;
 
     private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
         @Override
@@ -129,6 +181,16 @@ public class DeskClock extends Activity {
                 handleBatteryUpdate(
                     intent.getIntExtra("status", BATTERY_STATUS_UNKNOWN),
                     intent.getIntExtra("level", 0));
+            } else if (Intent.ACTION_DOCK_EVENT.equals(action)) {
+                int state = intent.getIntExtra(Intent.EXTRA_DOCK_STATE, -1);
+                if (DEBUG) Log.d(LOG_TAG, "ACTION_DOCK_EVENT, state=" + state);
+                if (state == Intent.EXTRA_DOCK_STATE_UNDOCKED) {
+                    if (mLaunchedFromDock) {
+                        // moveTaskToBack(false);
+                        finish();
+                    }
+                    mLaunchedFromDock = false;
+                }
             }
         }
     };
@@ -136,38 +198,172 @@ public class DeskClock extends Activity {
     private final Handler mHandy = new Handler() {
         @Override
         public void handleMessage(Message m) {
-            if (DEBUG) Log.d(LOG_TAG, "handleMessage: " + m.toString());
-
-            if (m.what == FETCH_WEATHER_DATA_MSG) {
-                if (!mWeatherFetchScheduled) return;
-                mWeatherFetchScheduled = false;
-                new Thread() { public void run() { fetchWeatherData(); } }.start();
-                scheduleWeatherFetchDelayed(FETCH_WEATHER_DELAY);
+            if (m.what == QUERY_WEATHER_DATA_MSG) {
+                new Thread() { public void run() { queryWeatherData(); } }.start();
+                scheduleWeatherQueryDelayed(QUERY_WEATHER_DELAY);
             } else if (m.what == UPDATE_WEATHER_DISPLAY_MSG) {
                 updateWeatherDisplay();
+            } else if (m.what == SCREEN_SAVER_TIMEOUT_MSG) {
+                saveScreen();
+            } else if (m.what == SCREEN_SAVER_MOVE_MSG) {
+                moveScreenSaver();
             }
         }
     };
 
+
+    private void moveScreenSaver() {
+        moveScreenSaverTo(-1,-1);
+    }
+    private void moveScreenSaverTo(int x, int y) {
+        if (!mScreenSaverMode) return;
+
+        final View saver_view = findViewById(R.id.saver_view);
+
+        DisplayMetrics metrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(metrics);
+
+        if (x < 0 || y < 0) {
+            int myWidth = saver_view.getMeasuredWidth();
+            int myHeight = saver_view.getMeasuredHeight();
+            x = (int)(mRNG.nextFloat()*(metrics.widthPixels - myWidth));
+            y = (int)(mRNG.nextFloat()*(metrics.heightPixels - myHeight));
+        }
+
+        if (DEBUG) Log.d(LOG_TAG, String.format("screen saver: %d: jumping to (%d,%d)",
+                System.currentTimeMillis(), x, y));
+
+        saver_view.setLayoutParams(new AbsoluteLayout.LayoutParams(
+            ViewGroup.LayoutParams.WRAP_CONTENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT,
+            x,
+            y));
+
+        // Synchronize our jumping so that it happens exactly on the second.
+        mHandy.sendEmptyMessageDelayed(SCREEN_SAVER_MOVE_MSG,
+            SCREEN_SAVER_MOVE_DELAY +
+            (1000 - (System.currentTimeMillis() % 1000)));
+    }
+
+    private void setWakeLock(boolean hold) {
+        if (DEBUG) Log.d(LOG_TAG, (hold ? "hold" : " releas") + "ing wake lock");
+        Window win = getWindow();
+        WindowManager.LayoutParams winParams = win.getAttributes();
+        winParams.flags |= WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
+        winParams.flags |= WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
+        winParams.flags |= WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON;
+        if (hold)
+            winParams.flags |= WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
+        else
+            winParams.flags &= (~WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        win.setAttributes(winParams);
+    }
+
+    private void scheduleScreenSaver() {
+        // reschedule screen saver
+        mHandy.removeMessages(SCREEN_SAVER_TIMEOUT_MSG);
+        mHandy.sendMessageDelayed(
+            Message.obtain(mHandy, SCREEN_SAVER_TIMEOUT_MSG),
+            SCREEN_SAVER_TIMEOUT);
+    }
+
+    private void restoreScreen() {
+        if (!mScreenSaverMode) return;
+        if (DEBUG) Log.d(LOG_TAG, "restoreScreen");
+        mScreenSaverMode = false;
+        initViews();
+        doDim(false); // restores previous dim mode
+        // policy: update weather info when returning from screen saver
+        if (mPluggedIn) requestWeatherDataFetch();
+
+        scheduleScreenSaver();
+
+        refreshAll();
+    }
+
+    // Special screen-saver mode for OLED displays that burn in quickly
+    private void saveScreen() {
+        if (mScreenSaverMode) return;
+        if (DEBUG) Log.d(LOG_TAG, "saveScreen");
+
+        // quickly stash away the x/y of the current date
+        final View oldTimeDate = findViewById(R.id.time_date);
+        int oldLoc[] = new int[2];
+        oldTimeDate.getLocationOnScreen(oldLoc);
+
+        mScreenSaverMode = true;
+        Window win = getWindow();
+        WindowManager.LayoutParams winParams = win.getAttributes();
+        winParams.flags |= WindowManager.LayoutParams.FLAG_FULLSCREEN;
+        win.setAttributes(winParams);
+
+        // give up any internal focus before we switch layouts
+        final View focused = getCurrentFocus();
+        if (focused != null) focused.clearFocus();
+
+        setContentView(R.layout.desk_clock_saver);
+
+        mTime = (DigitalClock) findViewById(R.id.time);
+        mDate = (TextView) findViewById(R.id.date);
+        mNextAlarm = (TextView) findViewById(R.id.nextAlarm);
+
+        final int color = mDimmed ? SCREEN_SAVER_COLOR_DIM : SCREEN_SAVER_COLOR;
+
+        ((TextView)findViewById(R.id.timeDisplay)).setTextColor(color);
+        ((TextView)findViewById(R.id.am_pm)).setTextColor(color);
+        mDate.setTextColor(color);
+        mNextAlarm.setTextColor(color);
+        mNextAlarm.setCompoundDrawablesWithIntrinsicBounds(
+            getResources().getDrawable(mDimmed
+                ? R.drawable.ic_lock_idle_alarm_saver_dim
+                : R.drawable.ic_lock_idle_alarm_saver),
+            null, null, null);
+
+        mBatteryDisplay =
+        mWeatherCurrentTemperature =
+        mWeatherHighTemperature =
+        mWeatherLowTemperature =
+        mWeatherLocation = null;
+        mWeatherIcon = null;
+
+        refreshDate();
+        refreshAlarm();
+
+        moveScreenSaverTo(oldLoc[0], oldLoc[1]);
+    }
+
+    @Override
+    public void onUserInteraction() {
+        if (mScreenSaverMode)
+            restoreScreen();
+    }
+
+    // Tell the Genie widget to load new data from the network.
+    private void requestWeatherDataFetch() {
+        if (DEBUG) Log.d(LOG_TAG, "forcing the Genie widget to update weather now...");
+        sendBroadcast(new Intent(ACTION_GENIE_REFRESH).putExtra("requestWeather", true));
+        // update the display with any new data
+        scheduleWeatherQueryDelayed(5000);
+    }
+
     private boolean supportsWeather() {
         return (mGenieResources != null);
     }
 
-    private void scheduleWeatherFetchDelayed(long delay) {
-        if (mWeatherFetchScheduled) return;
+    private void scheduleWeatherQueryDelayed(long delay) {
+        // cancel any existing scheduled queries
+        unscheduleWeatherQuery();
 
         if (DEBUG) Log.d(LOG_TAG, "scheduling weather fetch message for " + delay + "ms from now");
 
-        mWeatherFetchScheduled = true;
-
-        mHandy.sendEmptyMessageDelayed(FETCH_WEATHER_DATA_MSG, delay);
+        mHandy.sendEmptyMessageDelayed(QUERY_WEATHER_DATA_MSG, delay);
     }
 
-    private void unscheduleWeatherFetch() {
-        mWeatherFetchScheduled = false;
+    private void unscheduleWeatherQuery() {
+        mHandy.removeMessages(QUERY_WEATHER_DATA_MSG);
     }
 
-    private void fetchWeatherData() {
+    private void queryWeatherData() {
         // if we couldn't load the weather widget's resources, we simply
         // assume it's not present on the device.
         if (mGenieResources == null) return;
@@ -195,18 +391,36 @@ public class DeskClock extends Activity {
         }
 
         if (cur != null && cur.moveToFirst()) {
+            if (DEBUG) {
+                java.lang.StringBuilder sb =
+                    new java.lang.StringBuilder("Weather query result: {");
+                for(int i=0; i<cur.getColumnCount(); i++) {
+                    if (i>0) sb.append(", ");
+                    sb.append(cur.getColumnName(i))
+                        .append("=")
+                        .append(cur.getString(i));
+                }
+                sb.append("}");
+                Log.d(LOG_TAG, sb.toString());
+            }
+
             mWeatherIconDrawable = mGenieResources.getDrawable(cur.getInt(
                 cur.getColumnIndexOrThrow("iconResId")));
-            mWeatherTemperatureString = cur.getString(
-                cur.getColumnIndexOrThrow("highTemperature"));
+            mWeatherCurrentTemperatureString = String.format("%d\u00b0",
+                (cur.getInt(cur.getColumnIndexOrThrow("temperature"))));
+            mWeatherHighTemperatureString = String.format("%d\u00b0",
+                (cur.getInt(cur.getColumnIndexOrThrow("highTemperature"))));
+            mWeatherLowTemperatureString = String.format("%d\u00b0",
+                (cur.getInt(cur.getColumnIndexOrThrow("lowTemperature"))));
             mWeatherLocationString = cur.getString(
                 cur.getColumnIndexOrThrow("location"));
         } else {
-            Log.w(LOG_TAG, "No weather information available (cur=" 
+            Log.w(LOG_TAG, "No weather information available (cur="
                 + cur +")");
             mWeatherIconDrawable = null;
-            mWeatherTemperatureString = "";
-            mWeatherLocationString = "Weather data unavailable."; // TODO: internationalize
+            mWeatherHighTemperatureString = "";
+            mWeatherLowTemperatureString = "";
+            mWeatherLocationString = getString(R.string.weather_fetch_failure);
         }
 
         mHandy.sendEmptyMessage(UPDATE_WEATHER_DISPLAY_MSG);
@@ -214,11 +428,16 @@ public class DeskClock extends Activity {
 
     private void refreshWeather() {
         if (supportsWeather())
-            scheduleWeatherFetchDelayed(0);
+            scheduleWeatherQueryDelayed(0);
+        updateWeatherDisplay(); // in case we have it cached
     }
 
     private void updateWeatherDisplay() {
-        mWeatherTemperature.setText(mWeatherTemperatureString);
+        if (mWeatherCurrentTemperature == null) return;
+
+        mWeatherCurrentTemperature.setText(mWeatherCurrentTemperatureString);
+        mWeatherHighTemperature.setText(mWeatherHighTemperatureString);
+        mWeatherLowTemperature.setText(mWeatherLowTemperatureString);
         mWeatherLocation.setText(mWeatherLocationString);
         mWeatherIcon.setImageDrawable(mWeatherIconDrawable);
     }
@@ -226,6 +445,14 @@ public class DeskClock extends Activity {
     // Adapted from KeyguardUpdateMonitor.java
     private void handleBatteryUpdate(int plugStatus, int batteryLevel) {
         final boolean pluggedIn = (plugStatus == BATTERY_STATUS_CHARGING || plugStatus == BATTERY_STATUS_FULL);
+        if (pluggedIn != mPluggedIn) {
+            setWakeLock(pluggedIn);
+
+            if (pluggedIn) {
+                // policy: update weather info when attaching to power
+                requestWeatherDataFetch();
+            }
+        }
         if (pluggedIn != mPluggedIn || batteryLevel != mBatteryLevel) {
             mBatteryLevel = batteryLevel;
             mPluggedIn = pluggedIn;
@@ -234,6 +461,8 @@ public class DeskClock extends Activity {
     }
 
     private void refreshBattery() {
+        if (mBatteryDisplay == null) return;
+
         if (mPluggedIn /* || mBatteryLevel < LOW_BATTERY_THRESHOLD */) {
             mBatteryDisplay.setCompoundDrawablesWithIntrinsicBounds(
                 0, 0, android.R.drawable.ic_lock_idle_charging, 0);
@@ -246,10 +475,14 @@ public class DeskClock extends Activity {
     }
 
     private void refreshDate() {
-        mDate.setText(mDateFormat.format(new Date()));
+        final Date now = new Date();
+        if (DEBUG) Log.d(LOG_TAG, "refreshing date..." + now);
+        mDate.setText(DateFormat.format(mDateFormat, now));
     }
 
     private void refreshAlarm() {
+        if (mNextAlarm == null) return;
+
         String nextAlarm = Settings.System.getString(getContentResolver(),
                 Settings.System.NEXT_ALARM_FORMATTED);
         if (!TextUtils.isEmpty(nextAlarm)) {
@@ -271,135 +504,260 @@ public class DeskClock extends Activity {
 
     private void doDim(boolean fade) {
         View tintView = findViewById(R.id.window_tint);
+        if (tintView == null) return;
 
         Window win = getWindow();
         WindowManager.LayoutParams winParams = win.getAttributes();
 
+        winParams.flags |= (WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);
+        winParams.flags |= (WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+
         // dim the wallpaper somewhat (how much is determined below)
         winParams.flags |= (WindowManager.LayoutParams.FLAG_DIM_BEHIND);
 
         if (mDimmed) {
             winParams.flags |= WindowManager.LayoutParams.FLAG_FULLSCREEN;
-//            winParams.flags &= (~WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);
-            winParams.dimAmount = 0.5f; // pump up contrast in dim mode
+            winParams.dimAmount = DIM_BEHIND_AMOUNT_DIMMED;
 
             // show the window tint
-            tintView.startAnimation(AnimationUtils.loadAnimation(this, 
+            tintView.startAnimation(AnimationUtils.loadAnimation(this,
                 fade ? R.anim.dim
                      : R.anim.dim_instant));
         } else {
             winParams.flags &= (~WindowManager.LayoutParams.FLAG_FULLSCREEN);
-//            winParams.flags |= WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
-            winParams.dimAmount = 0.2f; // lower contrast in normal mode
-    
+            winParams.dimAmount = DIM_BEHIND_AMOUNT_NORMAL;
+
             // hide the window tint
-            tintView.startAnimation(AnimationUtils.loadAnimation(this, 
+            tintView.startAnimation(AnimationUtils.loadAnimation(this,
                 fade ? R.anim.undim
                      : R.anim.undim_instant));
         }
-        
+
         win.setAttributes(winParams);
     }
 
     @Override
+    public void onNewIntent(Intent newIntent) {
+        super.onNewIntent(newIntent);
+        if (DEBUG) Log.d(LOG_TAG, "onNewIntent with intent: " + newIntent);
+
+        // update our intent so that we can consult it to determine whether or
+        // not the most recent launch was via a dock event 
+        setIntent(newIntent);
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
+        if (DEBUG) Log.d(LOG_TAG, "onResume with intent: " + getIntent());
 
         // reload the date format in case the user has changed settings
         // recently
-        mDateFormat = java.text.DateFormat.getDateInstance(java.text.DateFormat.FULL);
+        mDateFormat = getString(com.android.internal.R.string.full_wday_month_day_no_year);
 
         IntentFilter filter = new IntentFilter();
         filter.addAction(Intent.ACTION_DATE_CHANGED);
         filter.addAction(Intent.ACTION_BATTERY_CHANGED);
+        filter.addAction(Intent.ACTION_DOCK_EVENT);
+        filter.addAction(ACTION_MIDNIGHT);
         registerReceiver(mIntentReceiver, filter);
 
+        Calendar today = Calendar.getInstance();
+        today.add(Calendar.DATE, 1);
+        mMidnightIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_MIDNIGHT), 0);
+        AlarmManager am = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
+        am.setRepeating(AlarmManager.RTC, today.getTimeInMillis(), AlarmManager.INTERVAL_DAY, mMidnightIntent);
+
+        // un-dim when resuming
+        mDimmed = false;
         doDim(false);
-        refreshAll();
+
+        restoreScreen(); // disable screen saver
+        refreshAll(); // will schedule periodic weather fetch
+
+        setWakeLock(mPluggedIn);
+
+        scheduleScreenSaver();
+
+        final boolean launchedFromDock
+            = getIntent().hasCategory(Intent.CATEGORY_DESK_DOCK);
+
+        if (supportsWeather() && launchedFromDock && !mLaunchedFromDock) {
+            // policy: fetch weather if launched via dock connection
+            if (DEBUG) Log.d(LOG_TAG, "Device now docked; forcing weather to refresh right now");
+            requestWeatherDataFetch();
+        }
+
+        mLaunchedFromDock = launchedFromDock;
     }
 
     @Override
     public void onPause() {
-        super.onPause();
+        if (DEBUG) Log.d(LOG_TAG, "onPause");
+
+        // Turn off the screen saver and cancel any pending timeouts.
+        // (But don't un-dim.)
+        mHandy.removeMessages(SCREEN_SAVER_TIMEOUT_MSG);
+        restoreScreen();
+
+        // Other things we don't want to be doing in the background.
         unregisterReceiver(mIntentReceiver);
-        unscheduleWeatherFetch();
+        AlarmManager am = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
+        am.cancel(mMidnightIntent);
+        unscheduleWeatherQuery();
+
+        super.onPause();
     }
 
+    @Override
+    public void onStop() {
+        if (DEBUG) Log.d(LOG_TAG, "onStop");
+
+        // Avoid situations where the user launches Alarm Clock and is
+        // surprised to find it in dim mode (because it was last used in dim
+        // mode, but that last use is long in the past).
+        mDimmed = false;
+
+        super.onStop();
+    }
 
     private void initViews() {
+        // give up any internal focus before we switch layouts
+        final View focused = getCurrentFocus();
+        if (focused != null) focused.clearFocus();
+
         setContentView(R.layout.desk_clock);
 
         mTime = (DigitalClock) findViewById(R.id.time);
         mDate = (TextView) findViewById(R.id.date);
         mBatteryDisplay = (TextView) findViewById(R.id.battery);
 
-        mWeatherTemperature = (TextView) findViewById(R.id.weather_temperature);
+        mTime.getRootView().requestFocus();
+
+        mWeatherCurrentTemperature = (TextView) findViewById(R.id.weather_temperature);
+        mWeatherHighTemperature = (TextView) findViewById(R.id.weather_high_temperature);
+        mWeatherLowTemperature = (TextView) findViewById(R.id.weather_low_temperature);
         mWeatherLocation = (TextView) findViewById(R.id.weather_location);
         mWeatherIcon = (ImageView) findViewById(R.id.weather_icon);
 
-        mNextAlarm = (TextView) findViewById(R.id.nextAlarm);
-
-        final Button alarmButton = (Button) findViewById(R.id.alarm_button);
-        alarmButton.setOnClickListener(new View.OnClickListener() {
+        final View.OnClickListener alarmClickListener = new View.OnClickListener() {
             public void onClick(View v) {
                 startActivity(new Intent(DeskClock.this, AlarmClock.class));
             }
-        });
+        };
+
+        mNextAlarm = (TextView) findViewById(R.id.nextAlarm);
+        mNextAlarm.setOnClickListener(alarmClickListener);
+
+        final ImageButton alarmButton = (ImageButton) findViewById(R.id.alarm_button);
+        alarmButton.setOnClickListener(alarmClickListener);
 
-        final Button galleryButton = (Button) findViewById(R.id.gallery_button);
+        final ImageButton galleryButton = (ImageButton) findViewById(R.id.gallery_button);
         galleryButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 try {
                     startActivity(new Intent(
                         Intent.ACTION_VIEW,
-                        android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI));
+                        android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI)
+                            .putExtra("slideshow", true)
+                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_CLEAR_TOP));
                 } catch (android.content.ActivityNotFoundException e) {
                     Log.e(LOG_TAG, "Couldn't launch image browser", e);
                 }
             }
         });
 
-        final Button musicButton = (Button) findViewById(R.id.music_button);
+        final ImageButton musicButton = (ImageButton) findViewById(R.id.music_button);
         musicButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 try {
-                    startActivity(new Intent(MUSIC_NOW_PLAYING_ACTIVITY));
+                    Intent musicAppQuery = getPackageManager()
+                        .getLaunchIntentForPackage(MUSIC_PACKAGE_ID)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                    if (musicAppQuery != null) {
+                        startActivity(musicAppQuery);
+                    }
                 } catch (android.content.ActivityNotFoundException e) {
                     Log.e(LOG_TAG, "Couldn't launch music browser", e);
                 }
             }
         });
 
-        final Button homeButton = (Button) findViewById(R.id.home_button);
+        final ImageButton homeButton = (ImageButton) findViewById(R.id.home_button);
         homeButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 startActivity(
                     new Intent(Intent.ACTION_MAIN)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_CLEAR_TOP)
                         .addCategory(Intent.CATEGORY_HOME));
             }
         });
 
-        final Button nightmodeButton = (Button) findViewById(R.id.nightmode_button);
+        final ImageButton nightmodeButton = (ImageButton) findViewById(R.id.nightmode_button);
         nightmodeButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 mDimmed = ! mDimmed;
                 doDim(true);
             }
         });
+
+        nightmodeButton.setOnLongClickListener(new View.OnLongClickListener() {
+            public boolean onLongClick(View v) {
+                saveScreen();
+                return true;
+            }
+        });
+
+        final View weatherView = findViewById(R.id.weather);
+        weatherView.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                if (!supportsWeather()) return;
+
+                Intent genieAppQuery = getPackageManager()
+                    .getLaunchIntentForPackage(GENIE_PACKAGE_ID)
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                if (genieAppQuery != null) {
+                    startActivity(genieAppQuery);
+                }
+            }
+        });
     }
 
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        initViews();
-        doDim(false);
-        refreshAll();
+        if (!mScreenSaverMode) {
+            initViews();
+            doDim(false);
+            refreshAll();
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.menu_item_alarms) {
+            startActivity(new Intent(DeskClock.this, AlarmClock.class));
+            return true;
+        } else if (item.getItemId() == R.id.menu_item_add_alarm) {
+            AlarmClock.addNewAlarm(this);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.desk_clock_menu, menu);
+        return true;
     }
 
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
+        mRNG = new Random();
+
         try {
             mGenieResources = getPackageManager().getResourcesForApplication(GENIE_PACKAGE_ID);
         } catch (PackageManager.NameNotFoundException e) {