OSDN Git Service

Merge the fullscreen change from master to donut for security.
authorPatrick Scott <phanna@android.com>
Thu, 18 Jun 2009 13:25:48 +0000 (09:25 -0400)
committerPatrick Scott <phanna@android.com>
Thu, 18 Jun 2009 13:25:48 +0000 (09:25 -0400)
commite2285895da5c1adc3259948c1ea41d339d88a57c
tree0eef677fe5fcdd70a4b3ef2e38fcb45b65ddf3cc
parent01b9b5baace6a45a7a4d45ba041b271662960aa4
Merge the fullscreen change from master to donut for security.

Rework the AlarmAlert dialog layout.

Make the layout portrait only to make it more uniform and nicer looking. Update
all the clock layouts to have the same size. The alert will have a larger clock
than the AlarmClock screen.

Remove the old hack to make the alert a dialog.

Inflate the views with a root so the layout params will be fill_parent. Use the
animate_circle resource in setBackgroundResource to clean up the code.

Add a new AlarmAlertFullScreen activity which makes the alert fullscreen with
the current wallpaper as the background. Query the keyguard manager during the
alarm broadcast to decide which activity to launch. The regular alert activity
shows above the current activity but the fullscreen activity will not show the
previous activity for security reasons.

Add the alarm_alert style that mimics the Theme.Dialog.Alert style but does not
rely on a private resource. Add dialog.9.png for the same reason.

Add a LinearLayout surrounding the alert layout to hold the background
wallpaper.
18 files changed:
AndroidManifest.xml
res/drawable/dialog.9.png [new file with mode: 0644]
res/layout-land/alarm_alert.xml [deleted file]
res/layout-land/alarm_clock.xml
res/layout/alarm_alert.xml
res/layout/alarm_clock.xml
res/layout/clock_basic_bw.xml
res/layout/clock_droid2.xml
res/layout/clock_droids.xml
res/layout/clock_googly.xml
res/layout/digital_clock.xml
res/values/styles.xml
src/com/android/alarmclock/AlarmAlert.java
src/com/android/alarmclock/AlarmAlertFullScreen.java [new file with mode: 0644]
src/com/android/alarmclock/AlarmAlertWakeLock.java
src/com/android/alarmclock/AlarmClock.java
src/com/android/alarmclock/AlarmReceiver.java
src/com/android/alarmclock/DigitalClock.java