History log of /packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
872c29e9aeb5ff1aa71f28b533573b7a53210a67 20-Oct-2012 Isaac Katzenelson <isaack@android.com> Alarm delete confirmation

Change-Id: I591c959efb051d800f6279701d84186aab9ecaae
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
9722dd0b2b040337ec22f4fa9dfa72a1ea83e42c 16-Nov-2012 Isaac Katzenelson <isaack@android.com> Make on/off switch more visible

Bug:7555181, 7536599

Changed the dimming effect of an alarm item in alarm settings. When the alarm is off
the alpha if the view is reduced except for the on/off switch.
Disable on/off switch when in CAB mode

Change-Id: I89173ca5124b12fe04a92783d2cc870cfda481c8
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
e85aa29405a8b809f3b83a4fca93d21f2b36f4ea 28-Oct-2012 Itzhak Katzenelson <isaack@android.com> Fixed response to taps in alarm "card"

Bug: 7427173
Added 2 listener to the label view and the daysOfWeek view.

Change-Id: I2f8676bdd65d6047304a493a50022c6f6fdbbe4f
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
687d3b672f3a86c108ecb121985d018d8c2481ae 25-Oct-2012 Chiao Cheng <chiaocheng@google.com> Saving selected alarm.

Fixed bug where orientation change during alarm picker causes error because
the currently selected alarm is lost.

Bug: 7402699
Change-Id: I86f4cbca34a024dc7f3ba7e2fe1a76f570c4e680
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
bb82c8cc2e111563a462a6eff9e6f22a110c6cf9 25-Oct-2012 Itzhak Katzenelson <isaack@android.com> Fix jerkiness in alarm list

Bug: 7411618
Moved scrolling runnable to be activated only in "onClick"
calls and not on all calls to expandAlarm.

Change-Id: Iace92a79e39ebfc038a258c5b4155daa77227031
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
0000f13dbdeda5e7c716bd5a8cf7e9ba08b1da52 23-Oct-2012 Isaac Katzenelson <isaack@android.com> Fix background for alarm list items

Bug: 7391088
Change-Id: Ie929285e47b0e62edbe99a39a39fed8d3f151148
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
9dad8db45bb8b5b971a5b34aec96617563d243bc 22-Oct-2012 Isaac Katzenelson <isaack@android.com> Fix crash in GetViewById

Bug: 7392687
Change-Id: I71be8f541004bff307c02652ea554ebea651447f
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
c1c37b50058c827518fa972651738847044f9871 22-Oct-2012 Isaac Katzenelson <isaack@android.com> Do not show time picker after alarm undo

Bug: 7388948

When undo was selected, add alarm was called which automatically opens the time picker.
Added a flag to control this feature depending if it is a new alarm or an alarm restored from undo.

Change-Id: I1dde1f8dc893226869cbfd05596a6c7bd2eddb85
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
96509e15991b34a54a3321c787b3c5d8edb16431 20-Oct-2012 Isaac Katzenelson <isaack@android.com> Open time picker when creating a new alarm

Bug: 7365352, 7339518

Also, scroll item to make sure it is fully visible when expanded

Change-Id: I5707b3a26cbe3506343a9e69a92b8b63c42d03bd
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
fa850403039aa9869159978bd83877652606e95b 17-Oct-2012 Isaac Katzenelson <isaack@android.com> Add support of long press to delete alarms

Bug: 7308745

Added support for "long press to delete" to alarm list.

Change-Id: I67ac27de106c87ab8b7cd139db08197c5d7e9538
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
3fd300659aeebffa2ed96f089eeee188cd53efb5 17-Oct-2012 Isaac Katzenelson <isaack@android.com> Fix crash in alarm adapter

Bug: 7360684
Change-Id: Ia328b79bcadb8eedf57e9e15d7f933b7747dce8e
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
c81760e098c7ef6370fd9e038c6264b06f17f232 12-Oct-2012 Isaac Katzenelson <isaack@android.com> Make the last ringtone selection the default

Bug: 7236309
Change-Id: Ib1c7f8fd3880ebb8101815423f6f93e43c3c5736
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
797e22b7224d20f4ce7303f59dc02989bdf83a24 12-Oct-2012 Chiao Cheng <chiaocheng@google.com> Add underline graphics to day of week buttons in alarm.

Wrapping toggle button in framelayout so underline will only exist under
text while clickable area extends beyond.

Bug: 7335408
Change-Id: I06b9ef334eff77dcec6493c4dd930972e0e16b5a
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
0f6e3350fed144e3909ba4e45f3006f042c0187c 11-Oct-2012 Sam Blitzstein <sblitz@google.com> Adding ability to label timers.

Bug: 7203259
Bug: 7324818
Change-Id: I482f4500bfab29ec0ace9b661d72e79473c40f25
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
2c24f71c5331b42ac58c69637c04db57d48ec918 11-Oct-2012 Chiao Cheng <chiaocheng@google.com> Sort alarms by time again.

Change default alarm to 12am instead of 6am. Added smooth scrolling to correct
position when order is changed from time modification. Also adding scroll back
to top when adding new alarm.

Bug: 7316415
Change-Id: I61bf4626a7c40694150ee95088eef137afbdd5d9
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
932e0129e244e2874dfa3c6be58b2fe9a20cc89d 10-Oct-2012 Sara Ting <sarating@google.com> Improve accessibility for visually impaired.

Bug:7303805
Change-Id: Ie215ace8c14c0399448bd297157c0a48ef24e0d5
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
aba3c451dccd54617947628045367c65febdee6b 11-Oct-2012 Chiao Cheng <chiaocheng@google.com> Major layout change for alarm list.

- Dim off alarms.
- Adjusted swipe helper to remember the starting alpha of the animated view.
This is required because an alarm may already be dimmed and thus not at
1f alpha.
- Change on/off buttons to switch.
- Change expand/collapse target to span width.

Bug: 7323086, 7317880
Change-Id: I9d9f0561c55dc8739372f93a695286123d29db80
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
e10e1df9d70879d9a44e86da390f5a8f26a36bae 11-Oct-2012 Isaac Katzenelson <isaack@android.com> Removed default selection from alarm ringtone picker

Bug: 7326063
Change-Id: Ib0dbcfe34b3fcc651dd9fca61e42c05d44dd476d
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
ffe12a38c31058d9c4b32343ff35122b1b8678fc 10-Oct-2012 Chiao Cheng <chiaocheng@google.com> Setting all days when repeat checkbox is turned on.

Also remembering the selected days when repeat is turned off. When repeat is
turned on, any previously selected days will be set. If previous does not exist
all days will be selected. The previous is only in effect for the lifetime of
the activity.

Bug: 7318257, 7315850
Change-Id: Idf89d29a2ee47a37b51ac5c7a916f62074339ead
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
dbd989a7aebc7914b2cdec3e0cb69e38fae670fb 09-Oct-2012 Chiao Cheng <chiaocheng@google.com> Hide alarm vibrate option when device does not support it.

Bug: 7315409
Change-Id: Ie0e44a0f1c842a3cf0e1415a0707d624ca864dca
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
a3b4c996cbd237c8306e5ea81ff760581c62e1b8 09-Oct-2012 Chiao Cheng <chiaocheng@google.com> Bolding days of week in alarm when selected.

Bug: 7311577
Change-Id: I7c12abe094ac54a3a51355f56503c43a5df9fc7b
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
51193c62415add1a5fcf7e4ac92e6ba543c2fb88 09-Oct-2012 Chiao Cheng <chiaocheng@google.com> Scroll to alarm when set alarm intent is passed in.

Scroll to and expand the specified alarm.

Bug: 7302654
Change-Id: Idf2936ae6f48424f3cafe61f7836a8b4bc737449
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
c042c7818064b644cf1e63dc784241ae6ed365a4 08-Oct-2012 Chiao Cheng <chiaocheng@google.com> Clear undo bar display state after action click.

When action is click, display state of undo bar is not cleared which causes
undo bar to show again when orientation changes. Fix clears the display state
after action click.

Bug: 7301536
Change-Id: I9c764f6ddf37633274b8b3d58d0f6a74d04a58bd
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
fa2e368e5f00fc8f78b9a47f55d86ccfc99750d2 07-Oct-2012 Chiao Cheng <chiaocheng@google.com> Changed "Off On" button to single text toggle.

Removing dual text on/off button as per UX discussin.

Bug: 7301302
Change-Id: Ide72b4d006090bc7064b09d480c2f16c66411641
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
00c0d8672ea4741a23ff875ca1a992b8ad080e78 06-Oct-2012 Chiao Cheng <chiaocheng@google.com> Fixing unique primary key error.

The undo feature is re-using primary keys. The existing check for existing keys
is not 100% correct. Fixed by actually checking the database right before an
insert. Also wrap in transaction to guarentee atomicity.

Remove undo bar when action bar is used.

Updated alarm toast to be consistent with in-place editing. Anytime alarm is
enabled, toast will be displayed.

Bug: 7299177
Change-Id: Iedce94b2ddf06002c2da239af9299151d3e267ab
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
aa3c30991070ed78289964bba6af72a25341cb39 06-Oct-2012 Daniel Sandler <dsandler@android.com> Pick sounds of TYPE_ALARM, not TYPE_RINGTONE.

Bug: 7298975
Change-Id: I5b965ab626cb04b562532aef7f1272acf3f408b8
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
0cb70993e26f300f92423bfced0d8cb3efc3f304 05-Oct-2012 Chiao Cheng <chiaocheng@google.com> Adding undo feature for alarm swipe delete.

Bug: 7288024
Change-Id: I5fdbeff6dd63a2ce56371d531f120aaf7da3a71a
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
d091ee89ab2aa5c47d4b7b05e1f5d7e204b99494 05-Oct-2012 Chiao Cheng <chiaocheng@google.com> Minor alarm in-place editing tweaks.

- Toggle off repeat removes all repeat state from underlying alarm in addition
to hiding the visual display.
- Changing time turns alarm on automatically.

Bug: 7289559
Change-Id: Ifbc4d1c7d994ec93717e2fd5b9267c9740ca1e82
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
4642e848a91180f6ff87acbfa54de1d0b945f19a 04-Oct-2012 Chiao Cheng <chiaocheng@google.com> Properly handle orientation change for alarm display/edit.

Normally activities are destroyed and re-created during an orientation change.
But many of the existing alarm activities have configChanges set in the
AndroidManifest file. This causes the framework to re-size instead of
re-creating the activity on orientation change. In turn, this prevents the
properly layouts and styles from being applied even though there are size
specific resources.

This caused a problem where the dialogs were too big after rotating from
portrait to landscape. Fixed the problem by removing configChanges and properly
handling orientation changes.

Bug: 7201797
Change-Id: I03ab20ce416db0bb8aeb0500dad2a08e7d015b52
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
3286630083faa144af00617718411bf66eb3242b 04-Oct-2012 Chiao Cheng <chiaocheng@google.com> Jank improvements.

Fetching a Ringtone object causes a media player to be instantiated for each
ringtone pulled. And as it sounds, it is pretty slow which causes scrolling
in the alarm list to stutter. Fix by caching ringtone when alarm is expanded
so subsequent renders are quick.

Changed alarm updates to be asynchronous.

Bug: 7262805
Change-Id: Ie7277f2b53f3bc4a49796a41a18572f26e124dba
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
f69905c6d3d1a59f99c0f3b902c8402b8aceda84 04-Oct-2012 Chiao Cheng <chiaocheng@google.com> Removing dialog again.

Bug: 7289277
Change-Id: I23eb5346607b0e028e4e55396c9ce57045514eb4
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
5c3795c271bc6160f0ae2056627e9e96ffdc335c 02-Oct-2012 Chiao Cheng <chiaocheng@google.com> Completely new alarm list with in-place editing.

- No longer using separate dialog for setting alarms in the normal workflow.
Set alarm dialog is still needed to handle external extends. Fate of old
set alarm activity is still to be decided.
- Removed dialog theme for sw600dp screens.
- Added label edit dialog.
- Added custom on/off button to improve smoothness of clicks by increasing
hit box of clickable area.

Bug: 6164920
Change-Id: I19567658535f3ec78755328a147376a81d5363a8
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
421751e187dfa61bc1e48b52cdaf366628b06dd4 27-Sep-2012 Isaac Katzenelson <isaack@android.com> New world clock

Change-Id: I772726bc26db55e93c22b1add6fa4081f84b01a5
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
2527ef1b1ad7c48ffb2f5ed6aaa6271cc971c214 24-Sep-2012 Yorke Lee <yorkelee@google.com> Make up button in AlarmClock return to DeskClock

Bug: 7221205
Change-Id: I7e9cfe2a882fd4bf090f7c789333e6e0f6c245b3
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
6fc34de781d8fece646b16dc289bbf4c0b01fde4 20-Sep-2012 Isaac Katzenelson <isaack@android.com> Support for help menu item with smartlink

Bug: 7198428
Change-Id: I47a0078056dd6068749ca2539bf53db9ddaf4af8
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
63211efa1565b5dc171938740ba183302d0e46f3 14-Sep-2012 Isaac Katzenelson <isaack@android.com> Merge clock to JB-MR1

Change-Id: Ic2b550adb16f593a037939b2d1a2d4f60f4c5a5d
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
278ea920432b10912cd32c06f3fc4ad4dc6af7aa 18-May-2012 Michael Chan <chanm@google.com> Now you can get to settings in AlarmClock on a tablet

Bug: 6492391
Change-Id: Ifdf5f461f884fc3bcd5f1f570abf19248f58bf52
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
c8824e5633c5f54b9eb42b2336c5f15d7847f1c4 14-May-2012 Steve Levis <stevenl@google.com> Update DeskClock's ActionBar for Alarm List

- add "up affordance" to go back to desk clock
- remove "desk clock" menu item from overflow menu
- remove "Add alarm" list item. Only have '+' in actionbar

Bug: 5954770
Change-Id: I458d8b3e9fa212c9807b6f3e928a3f2b19e47b7c
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
927b49cc5b771a64b7159a80b490e4c8bc1bdcae 07-Oct-2011 Erik <epastern@google.com> b/5397609 Remove uneeded menu items from DeskClock screen

Remove 'Alarms' and 'Add alarm' menu items from the main clock
screen and also finish the alarms screen when launching the clock
screen.

Change-Id: I878477b755b84bc9d221a4582e1eccee8be01406
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
41a754faf657c2ac7e414051d0c711c0ee994457 31-Aug-2011 Erik <epastern@google.com> b/3368728 update icons/layout for add alarm

Change-Id: I67a8d495832b4086b2c533091e02ca3193fad796
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
73327b39cf35c8f2f4e5ba1ac30c6fd41a99d10f 24-Aug-2011 Erik <epastern@google.com> b/5076132 Work on matching clock redlines

Also rips out a lot of now unused code.

Change-Id: Idd3f9dd0d3a1395897ea7c8b0926d09da5cb1794
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
e4b231dda1a6e0181737f6a56361e4e97188b90a 19-Jan-2011 Dmitri Plotnikov <dplotnikov@google.com> Changed design of the alarm dialog

Change-Id: I8971c58b963fbab8078bae087c44a5257d5c3d91
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
fb6883da15b57a3d5006b8978c650cbb2bbda52d 16-Jan-2011 Dmitri Plotnikov <dplotnikov@google.com> Turning alarm config into dialog activities

Change-Id: Iaad2b39d1a9722934aa9128e5fbe255946521edb
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
602efeb229befe82f943d36792b1702f7ee54d88 15-Jan-2011 Dmitri Plotnikov <dplotnikov@google.com> Using the AndroidClock font in DesktopClock

Change-Id: I74ada0ea8838fe671525920b160a69e60a2a9021
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
77f14bd0ce48db935911da5d0a92b6348e6197fb 15-Dec-2010 Patrick Scott <phanna@android.com> Implement EXTRA_SKIP_UI.

Change SetAlarm to take an alarm object instead of just the id. Have
HandleSetAlarm pass the new Alarm object to the activity if EXTRA_SKIP_UI is
false.

Update TestAddAlarm to toggle the UI.

Bumped version number.

Bug: 3284120
Change-Id: Ie84ac8e3d7a63bfd64e40c626e577ce8b1f371b9
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
e4720df2c1fd952e44771ea30063a4e8dc39c47a 11-Oct-2010 Brad Fitzpatrick <bradfitz@android.com> Close AlarmClock cursor, don't just deactivate it.

Bug: 3082936
Change-Id: I1e7ba769cc920bd2da2823afb2932dd352c5a15e
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
bb13b216f986fc75dbd82d38f2bd6b2fbeb08abd 10-Aug-2010 Patrick Scott <phanna@android.com> Check for -1 id before modifying alarms.

Bug: 2898729
Change-Id: I9f70ee40fbcebeae2028c19a3b355e5d1cc433d4
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
e46be904bd76dff5a13aeef12e9bfeddac7bbe81 27-Jan-2010 Patrick Scott <phanna@android.com> Moving alarm creation into SetAlarm.

This change allows the user to create a new alarm and then press "Revert"
without having already created the alarm.

Refactor a few methods to take an Alarm object rather than all the alarm fields.
The static method in AlarmClock to create a new alarm is no longer needed. Do
some cleanup in AlarmProvider around intial values.

Bug: 2338234
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
c3f77cc16633551c4daf1c160f4655762dda9a3b 02-Dec-2009 Patrick Scott <phanna@android.com> resolved conflicts for merge of 90c4833f to eclair-mr2
90c4833f94f4775f747333f8bd67107364a1d9c1 23-Nov-2009 Patrick Scott <phanna@android.com> UI changes based on feedback from Jeff and Amar.

Bug: 2278206
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
4d52065d336a3e672bc192e66cc1ba5ece7a0035 23-Nov-2009 Daniel Sandler <dsandler@google.com> am ddacabc2: Add "add alarm" menu to the DeskClock activity.

Merge commit 'ddacabc24b515db4fa6c7a289ef81d8050c8062c' into eclair-mr2

* commit 'ddacabc24b515db4fa6c7a289ef81d8050c8062c':
Add "add alarm" menu to the DeskClock activity.
ddacabc24b515db4fa6c7a289ef81d8050c8062c 23-Nov-2009 Daniel Sandler <dsandler@google.com> Add "add alarm" menu to the DeskClock activity.

Rather than copying code from AlarmClock, there is now a
version of addNewAlarm() that can be invoked from any
activity. (AlarmClock now uses it, along with DeskClock.)

Part of bug http://b/2278197 .
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
62598e4eb795e56e06e0b20891be707b9fd11c15 18-Nov-2009 Patrick Scott <phanna@android.com> am f1e8069b: UI tweaks to meet Jeff\'s spec.

Merge commit 'f1e8069bcd1755d9ef2322b705d8d9d6b83728f0' into eclair-mr2

* commit 'f1e8069bcd1755d9ef2322b705d8d9d6b83728f0':
UI tweaks to meet Jeff's spec.
f1e8069bcd1755d9ef2322b705d8d9d6b83728f0 18-Nov-2009 Patrick Scott <phanna@android.com> UI tweaks to meet Jeff's spec.

Colors and text sizes are exactly how Jeff specified in the pdf. I tried to
match the size of everything based on looks but I might be a little off in
padding. The shadow effect on the bottom clock has been left out for now since
there are no specifics in the spec for each of the shadow components and I
cannot figure it out based on the drawing.
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
f6f1e5d224b8522d6f62ece1dff4180b381f2a47 16-Nov-2009 Patrick Scott <phanna@android.com> resolved conflicts for merge of e3f01aff to eclair-mr2
e3f01aff06d4bddb09215ccad3d8502de9164966 16-Nov-2009 Patrick Scott <phanna@android.com> Finish the UI improvements for the alarm list.
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
7e344f5d5bd60e275e4ccd87b6b34b1ae2c6d7d7 16-Nov-2009 Patrick Scott <phanna@android.com> resolved conflicts for merge of 4e1b06eb to eclair-mr2
4e1b06ebcf08dd57240a56bac6f923b2e72ea793 16-Nov-2009 Patrick Scott <phanna@android.com> New UI for the list of alarms.

Still need to put the "Add alarm" item at the top and the clock at the bottom.
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
e8d2668517e7e5b3e18f6c92949d2d4a673ec5b3 22-Oct-2009 Patrick Scott <phanna@android.com> resolved conflicts for merge of da3b21c3 to eclair-mr2
da3b21c3fb5227cfabe7fefa777470d7a4604bb0 22-Oct-2009 Patrick Scott <phanna@android.com> Show AM/PM in the same spot on the clock.

Make the alarm list, main screen, and alert consistent. Have DigitalClock deal
with the AM/PM strings. Put a little padding above and below the clock in the
alert.
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
f4a785b4dc7b71bc7c3a0e398293f1050516c088 22-Oct-2009 Patrick Scott <phanna@android.com> resolved conflicts for merge of dce90517 to eclair-mr2
dce90517954050428bfaf20e1409c10d372a4759 20-Oct-2009 Patrick Scott <phanna@android.com> Remove the menu and replace with buttons.

Change the layout to allow two buttons at the bottom of the list. Update the
"Add alarm" button when adding/removing alarms to change enabled state.
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
2eb3900c6917520f546f44e4d9ca6f045cffe9ea 19-Oct-2009 Patrick Scott <phanna@android.com> resolved conflicts for merge of aafb2fd2 to eclair-mr2
aafb2fd272f3c97f74043c11469ad301d3bd4026 19-Oct-2009 Patrick Scott <phanna@android.com> Remove the clock face from the alarm list.

Remove all the clock layouts except the digital. Remove the clock picker and any
settings related to change the clock face.

Next step: Move the settings and add alarm menu items to buttons.
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java
3dbaa9d07abf3133024bac468e452a071f270fac 17-Oct-2009 Daniel Sandler <dsandler@google.com> 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.
fa954248b41b567dfa2ddd7bd063d3936a51758e 16-Oct-2009 Daniel Sandler <dsandler@google.com> Moving things around a little in the new DeskClock.

- Package is now com.android.deskclock
- Launches in response to insertion in desk dock or
DESK dialercode

TODO next: split the AlarmClock activity into a DeskClock
and AlarmList (or similar).
/packages/apps/DeskClock/src/com/android/deskclock/AlarmClock.java