am fa954248: Moving things around a little in the new DeskClock.

Merge commit 'fa954248b41b567dfa2ddd7bd063d3936a51758e' into eclair-mr2

* commit 'fa954248b41b567dfa2ddd7bd063d3936a51758e':
  Moving things around a little in the new DeskClock.

diff --cc src/com/android/deskclock/AlarmAlert.java
index 0039ca8,732bee8..72b8a3b
--- 1/src/com/android/alarmclock/AlarmAlert.java
--- 2/src/com/android/deskclock/AlarmAlert.java
+++ b/src/com/android/deskclock/AlarmAlert.java
@@@ -14,33 -14,53 +14,33 @@@
   * limitations under the License.
   */
  
- package com.android.alarmclock;
+ package com.android.deskclock;
  
 -import android.app.Activity;
 -import android.app.Notification;
 -import android.app.NotificationManager;
 -import android.app.PendingIntent;
 -import android.content.Context;
 +import android.app.KeyguardManager;
  import android.content.BroadcastReceiver;
 +import android.content.Context;
  import android.content.Intent;
  import android.content.IntentFilter;
 -import android.content.SharedPreferences;
 -import android.content.res.Configuration;
  import android.os.Bundle;
 -import android.preference.PreferenceManager;
 -import android.view.KeyEvent;
 -import android.view.View;
 -import android.view.ViewGroup;
 -import android.view.LayoutInflater;
 -import android.view.Window;
 +import android.os.Handler;
 +import android.os.Message;
  import android.view.WindowManager;
 -import android.widget.Button;
 -import android.widget.Toast;
 -import android.widget.TextView;
 -
 -import java.util.Calendar;
  
  /**
 - * Alarm Clock alarm alert: pops visible indicator and plays alarm
 - * tone
 + * Full screen alarm alert: pops visible indicator and plays alarm tone. This
 + * activity shows the alert as a dialog.
   */
 -public class AlarmAlert extends Activity {
 -
 -    // These defaults must match the values in res/xml/settings.xml
 -    private static final String DEFAULT_SNOOZE = "10";
 -    private static final String DEFAULT_VOLUME_BEHAVIOR = "2";
 +public class AlarmAlert extends AlarmAlertFullScreen {
  
 -    private Alarm mAlarm;
 -    private int mVolumeBehavior;
 +    // If we try to check the keyguard more than 5 times, just launch the full
 +    // screen activity.
 +    private int mKeyguardRetryCount;
 +    private final int MAX_KEYGUARD_CHECKS = 5;
  
 -    // Receives the ALARM_KILLED action from the AlarmKlaxon.
 -    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
 +    private final Handler mHandler = new Handler() {
          @Override
 -        public void onReceive(Context context, Intent intent) {
 -            Alarm alarm = intent.getParcelableExtra(Alarms.ALARM_INTENT_EXTRA);
 -            if (mAlarm.id == alarm.id) {
 -                dismiss(true);
 -            }
 +        public void handleMessage(Message msg) {
 +            handleScreenOff((KeyguardManager) msg.obj);
          }
      };
  

diff --cc src/com/android/deskclock/AlarmAlertFullScreen.java
index 08c13f0,fe7d61d..1a43d25
--- 1/src/com/android/alarmclock/AlarmAlertFullScreen.java
--- 2/src/com/android/deskclock/AlarmAlertFullScreen.java
+++ b/src/com/android/deskclock/AlarmAlertFullScreen.java
@@@ -14,58 -14,17 +14,58 @@@
   * limitations under the License.
   */
  
- package com.android.alarmclock;
+ package com.android.deskclock;
  
 +import android.app.Activity;
 +import android.app.Notification;
 +import android.app.NotificationManager;
 +import android.app.PendingIntent;
 +import android.content.Context;
 +import android.content.BroadcastReceiver;
 +import android.content.Intent;
 +import android.content.IntentFilter;
 +import android.content.SharedPreferences;
 +import android.content.res.Configuration;
  import android.os.Bundle;
 +import android.preference.PreferenceManager;
 +import android.view.KeyEvent;
 +import android.view.View;
 +import android.view.ViewGroup;
 +import android.view.LayoutInflater;
 +import android.view.Window;
  import android.view.WindowManager;
 +import android.widget.Button;
 +import android.widget.Toast;
 +import android.widget.TextView;
 +
 +import java.util.Calendar;
  
  /**
 - * Full screen alarm alert: pops visible indicator and plays alarm tone. This
 - * activity displays the alert in full screen in order to be secure. The
 - * background is the current wallpaper.
 + * Alarm Clock alarm alert: pops visible indicator and plays alarm
 + * tone. This activity is the full screen version which shows over the lock
 + * screen with the wallpaper as the background.
   */
 -public class AlarmAlertFullScreen extends AlarmAlert {
 +public class AlarmAlertFullScreen extends Activity {
 +
 +    // These defaults must match the values in res/xml/settings.xml
 +    private static final String DEFAULT_SNOOZE = "10";
 +    private static final String DEFAULT_VOLUME_BEHAVIOR = "2";
 +    protected static final String SCREEN_OFF = "screen_off";
 +
 +    protected Alarm mAlarm;
 +    private int mVolumeBehavior;
 +
 +    // Receives the ALARM_KILLED action from the AlarmKlaxon.
 +    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
 +        @Override
 +        public void onReceive(Context context, Intent intent) {
 +            Alarm alarm = intent.getParcelableExtra(Alarms.ALARM_INTENT_EXTRA);
 +            if (alarm != null && mAlarm.id == alarm.id) {
 +                dismiss(true);
 +            }
 +        }
 +    };
 +
      @Override
      protected void onCreate(Bundle icicle) {
          super.onCreate(icicle);

diff --cc src/com/android/deskclock/AlarmClock.java
Simple merge

diff --cc src/com/android/deskclock/AnalogAppWidgetProvider.java
index c522b17,d78f82f..a493d90
--- 1/src/com/android/alarmclock/AnalogAppWidgetProvider.java
--- 2/src/com/android/deskclock/AnalogAppWidgetProvider.java
+++ b/src/com/android/deskclock/AnalogAppWidgetProvider.java
@@@ -14,8 -14,9 +14,8 @@@
   * limitations under the License.
   */
  
- package com.android.alarmclock;
+ package com.android.deskclock;
  
 -import android.app.AlarmManager;
  import android.app.PendingIntent;
  import android.appwidget.AppWidgetManager;
  import android.content.BroadcastReceiver;

diff --cc src/com/android/deskclock/SetAlarm.java
Simple merge