OSDN Git Service
Daniel Sandler [Fri, 23 Oct 2009 14:48:16 +0000 (07:48 -0700)]
am
11ba6ccc: am
86593141: am
40f11ae7: Reduce size of digital clock display.
Merge commit '
11ba6ccc8bf79c2248024e2441c0440c1ba780eb'
* commit '
11ba6ccc8bf79c2248024e2441c0440c1ba780eb':
Reduce size of digital clock display.
Daniel Sandler [Fri, 23 Oct 2009 14:48:12 +0000 (07:48 -0700)]
am
b8359a21: am
56eac7c6: am
ef18177f: Wire up date & next alarm displays.
Merge commit '
b8359a21012133c44354e45e1f07475bced48245'
* commit '
b8359a21012133c44354e45e1f07475bced48245':
Wire up date & next alarm displays.
Daniel Sandler [Fri, 23 Oct 2009 14:43:07 +0000 (07:43 -0700)]
am
86593141: am
40f11ae7: Reduce size of digital clock display.
Merge commit '
86593141acece698968fc40a4a1e47feabe79d53' into eclair-mr2-plus-aosp
* commit '
86593141acece698968fc40a4a1e47feabe79d53':
Reduce size of digital clock display.
Daniel Sandler [Fri, 23 Oct 2009 14:43:02 +0000 (07:43 -0700)]
am
56eac7c6: am
ef18177f: Wire up date & next alarm displays.
Merge commit '
56eac7c6cb75f0ebc77afc07601569eb8df82d27' into eclair-mr2-plus-aosp
* commit '
56eac7c6cb75f0ebc77afc07601569eb8df82d27':
Wire up date & next alarm displays.
Daniel Sandler [Fri, 23 Oct 2009 14:37:28 +0000 (07:37 -0700)]
am
40f11ae7: Reduce size of digital clock display.
Merge commit '
40f11ae73eabb50048571a83897968de03011854' into eclair-mr2
* commit '
40f11ae73eabb50048571a83897968de03011854':
Reduce size of digital clock display.
Daniel Sandler [Fri, 23 Oct 2009 14:37:23 +0000 (07:37 -0700)]
am
ef18177f: Wire up date & next alarm displays.
Merge commit '
ef18177f9bbbeab8ef266c3f080175bc813dc34c' into eclair-mr2
* commit '
ef18177f9bbbeab8ef266c3f080175bc813dc34c':
Wire up date & next alarm displays.
Daniel Sandler [Fri, 23 Oct 2009 14:02:16 +0000 (10:02 -0400)]
Reduce size of digital clock display.
Clockopia has substantially different glyph widths across
[0..9], and a pathologically wide time (e.g. "12:55") was
nudging "AM" onto two lines.
Daniel Sandler [Thu, 22 Oct 2009 13:42:27 +0000 (09:42 -0400)]
Wire up date & next alarm displays.
Change-Id: I367e0dcdb3fdfa7256dfd5ce54097c8206806f51
Patrick Scott [Thu, 22 Oct 2009 18:17:52 +0000 (11:17 -0700)]
am
abb8a9ac: am
e8d26685: resolved conflicts for merge of
da3b21c3 to eclair-mr2
Merge commit '
abb8a9ac668a4bea3446a1b102fc7fb2fee66613'
* commit '
abb8a9ac668a4bea3446a1b102fc7fb2fee66613':
Show AM/PM in the same spot on the clock.
Patrick Scott [Thu, 22 Oct 2009 18:17:49 +0000 (11:17 -0700)]
am
89b92b43: am
2bf4d3b5: am
702afb13: Replace AlarmClock with DeskClock.
Merge commit '
89b92b434f4e239712de2bc1a10361ba6967bdc6'
* commit '
89b92b434f4e239712de2bc1a10361ba6967bdc6':
Replace AlarmClock with DeskClock.
Daniel Sandler [Thu, 22 Oct 2009 18:17:45 +0000 (11:17 -0700)]
am
9fb235dc: am
72c38175: am
f8317ad7: New DeskClock activity, now the main app entry point.
Merge commit '
9fb235dcf2da65f1b76150556f7e0619709dfb6b'
* commit '
9fb235dcf2da65f1b76150556f7e0619709dfb6b':
New DeskClock activity, now the main app entry point.
Patrick Scott [Thu, 22 Oct 2009 18:07:36 +0000 (11:07 -0700)]
am
e8d26685: resolved conflicts for merge of
da3b21c3 to eclair-mr2
Merge commit '
e8d2668517e7e5b3e18f6c92949d2d4a673ec5b3' into eclair-mr2-plus-aosp
* commit '
e8d2668517e7e5b3e18f6c92949d2d4a673ec5b3':
Show AM/PM in the same spot on the clock.
Patrick Scott [Thu, 22 Oct 2009 18:04:05 +0000 (11:04 -0700)]
am
2bf4d3b5: am
702afb13: Replace AlarmClock with DeskClock.
Merge commit '
2bf4d3b5418d7a4b43be184f5c5b18832bdc928c' into eclair-mr2-plus-aosp
* commit '
2bf4d3b5418d7a4b43be184f5c5b18832bdc928c':
Replace AlarmClock with DeskClock.
Daniel Sandler [Thu, 22 Oct 2009 18:04:02 +0000 (11:04 -0700)]
am
72c38175: am
f8317ad7: New DeskClock activity, now the main app entry point.
Merge commit '
72c3817544e0e84756f5e0c627ad4a72f9156790' into eclair-mr2-plus-aosp
* commit '
72c3817544e0e84756f5e0c627ad4a72f9156790':
New DeskClock activity, now the main app entry point.
Patrick Scott [Thu, 22 Oct 2009 17:55:48 +0000 (13:55 -0400)]
resolved conflicts for merge of
da3b21c3 to eclair-mr2
Patrick Scott [Thu, 22 Oct 2009 17:49:35 +0000 (10:49 -0700)]
am
702afb13: Replace AlarmClock with DeskClock.
Merge commit '
702afb13b934d6e5c0ef9c2d761bc083339d8867' into eclair-mr2
* commit '
702afb13b934d6e5c0ef9c2d761bc083339d8867':
Replace AlarmClock with DeskClock.
Daniel Sandler [Thu, 22 Oct 2009 17:49:31 +0000 (10:49 -0700)]
am
f8317ad7: New DeskClock activity, now the main app entry point.
Merge commit '
f8317ad7146b1cdfeded7acb23ae8f770b2d3f97' into eclair-mr2
* commit '
f8317ad7146b1cdfeded7acb23ae8f770b2d3f97':
New DeskClock activity, now the main app entry point.
Patrick Scott [Thu, 22 Oct 2009 15:13:13 +0000 (11:13 -0400)]
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.
Patrick Scott [Thu, 22 Oct 2009 14:30:53 +0000 (10:30 -0400)]
Replace AlarmClock with DeskClock.
Product files need to specify DeskClock to trigger this.
Patrick Scott [Thu, 22 Oct 2009 13:46:16 +0000 (06:46 -0700)]
am
0e106a80: am
f4a785b4: resolved conflicts for merge of
dce90517 to eclair-mr2
Merge commit '
0e106a802df3689bdd9940dbc463fe8bef5b4b22'
* commit '
0e106a802df3689bdd9940dbc463fe8bef5b4b22':
Remove the menu and replace with buttons.
Patrick Scott [Thu, 22 Oct 2009 13:40:21 +0000 (06:40 -0700)]
am
f4a785b4: resolved conflicts for merge of
dce90517 to eclair-mr2
Merge commit '
f4a785b4dc7b71bc7c3a0e398293f1050516c088' into eclair-mr2-plus-aosp
* commit '
f4a785b4dc7b71bc7c3a0e398293f1050516c088':
Remove the menu and replace with buttons.
Patrick Scott [Thu, 22 Oct 2009 13:33:35 +0000 (09:33 -0400)]
resolved conflicts for merge of
dce90517 to eclair-mr2
Daniel Sandler [Tue, 20 Oct 2009 20:51:32 +0000 (16:51 -0400)]
New DeskClock activity, now the main app entry point.
UI not yet wired up for the most part, but Alarms should
take you to the AlarmClock activity, and there's a
functional implementation of screen dimming ("nightstand
mode").
Patrick Scott [Tue, 20 Oct 2009 20:30:55 +0000 (16:30 -0400)]
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.
Patrick Scott [Tue, 20 Oct 2009 16:43:39 +0000 (09:43 -0700)]
am
b0c704ab: am
109d4af6: am
52b3d633: Use Clockopia as the typeface for the digital clock.
Merge commit '
b0c704ab60bc9bf7ea1d974f6c047b53a32b26bd'
* commit '
b0c704ab60bc9bf7ea1d974f6c047b53a32b26bd':
Use Clockopia as the typeface for the digital clock.
Patrick Scott [Tue, 20 Oct 2009 16:35:35 +0000 (09:35 -0700)]
am
109d4af6: am
52b3d633: Use Clockopia as the typeface for the digital clock.
Merge commit '
109d4af68f0536813786a2c4ca01a462f8755a88' into eclair-mr2-plus-aosp
* commit '
109d4af68f0536813786a2c4ca01a462f8755a88':
Use Clockopia as the typeface for the digital clock.
Patrick Scott [Tue, 20 Oct 2009 16:22:53 +0000 (09:22 -0700)]
am
52b3d633: Use Clockopia as the typeface for the digital clock.
Merge commit '
52b3d633a031c64dcefefc4884b9cea5781425c2' into eclair-mr2
* commit '
52b3d633a031c64dcefefc4884b9cea5781425c2':
Use Clockopia as the typeface for the digital clock.
Patrick Scott [Tue, 20 Oct 2009 15:10:33 +0000 (11:10 -0400)]
Use Clockopia as the typeface for the digital clock.
Patrick Scott [Mon, 19 Oct 2009 20:52:47 +0000 (13:52 -0700)]
Patrick Scott [Mon, 19 Oct 2009 20:52:44 +0000 (13:52 -0700)]
am
5e48334f: am
2eb3900c: resolved conflicts for merge of
aafb2fd2 to eclair-mr2
Merge commit '
5e48334ff203cba18d70197f95648e860b27d21d'
* commit '
5e48334ff203cba18d70197f95648e860b27d21d':
Remove the clock face from the alarm list.
Patrick Scott [Mon, 19 Oct 2009 20:47:06 +0000 (13:47 -0700)]
am
1d09799c: am
93e942a9: Change the default alarms.
Merge commit '
1d09799c923973c491a6e04594d254401b3fd9a7' into eclair-mr2-plus-aosp
* commit '
1d09799c923973c491a6e04594d254401b3fd9a7':
Change the default alarms.
Patrick Scott [Mon, 19 Oct 2009 20:47:03 +0000 (13:47 -0700)]
am
2eb3900c: resolved conflicts for merge of
aafb2fd2 to eclair-mr2
Merge commit '
2eb3900c6917520f546f44e4d9ca6f045cffe9ea' into eclair-mr2-plus-aosp
* commit '
2eb3900c6917520f546f44e4d9ca6f045cffe9ea':
Remove the clock face from the alarm list.
Patrick Scott [Mon, 19 Oct 2009 20:42:03 +0000 (13:42 -0700)]
am
93e942a9: Change the default alarms.
Merge commit '
93e942a97a3aba0ad68be6b3db181c939199fa2e' into eclair-mr2
* commit '
93e942a97a3aba0ad68be6b3db181c939199fa2e':
Change the default alarms.
Patrick Scott [Mon, 19 Oct 2009 20:37:42 +0000 (16:37 -0400)]
resolved conflicts for merge of
aafb2fd2 to eclair-mr2
Patrick Scott [Mon, 19 Oct 2009 20:15:39 +0000 (16:15 -0400)]
Change the default alarms.
8:30 am MTWThF
9:00 am SatSun
Patrick Scott [Mon, 19 Oct 2009 12:52:35 +0000 (08:52 -0400)]
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.
Daniel Sandler [Sat, 17 Oct 2009 00:52:19 +0000 (17:52 -0700)]
am
8934aac7: am
3dbaa9d0: am
fa954248: Moving things around a little in the new DeskClock.
Merge commit '
8934aac7308338be012d2b47dbb7b1edcc0404a1'
* commit '
8934aac7308338be012d2b47dbb7b1edcc0404a1':
Moving things around a little in the new DeskClock.
Daniel Sandler [Sat, 17 Oct 2009 00:46:03 +0000 (17:46 -0700)]
am
3dbaa9d0: am
fa954248: Moving things around a little in the new DeskClock.
Merge commit '
3dbaa9d07abf3133024bac468e452a071f270fac' into eclair-mr2-plus-aosp
* commit '
3dbaa9d07abf3133024bac468e452a071f270fac':
Moving things around a little in the new DeskClock.
Daniel Sandler [Sat, 17 Oct 2009 00:41:07 +0000 (17:41 -0700)]
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.
Daniel Sandler [Fri, 16 Oct 2009 20:12:30 +0000 (16:12 -0400)]
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).
Patrick Scott [Fri, 16 Oct 2009 17:46:50 +0000 (10:46 -0700)]
Patrick Scott [Fri, 16 Oct 2009 17:41:00 +0000 (10:41 -0700)]
Patrick Scott [Fri, 16 Oct 2009 17:36:31 +0000 (10:36 -0700)]
Patrick Scott [Fri, 16 Oct 2009 17:28:58 +0000 (13:28 -0400)]
Fix the build.
Eric Fischer [Wed, 14 Oct 2009 00:17:56 +0000 (17:17 -0700)]
am
4fd2fedf: (-s ours) am
a00e52f8: Import revised translations. DO NOT MERGE
Merge commit '
4fd2fedf24d7f49a252c4cbf74959ead269e5d16'
* commit '
4fd2fedf24d7f49a252c4cbf74959ead269e5d16':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 14 Oct 2009 00:08:51 +0000 (17:08 -0700)]
am
a00e52f8: Import revised translations. DO NOT MERGE
Merge commit '
a00e52f8612510e9f08c59f92698601d3c7b26c9' into eclair-mr2-plus-aosp
* commit '
a00e52f8612510e9f08c59f92698601d3c7b26c9':
Import revised translations. DO NOT MERGE
Patrick Scott [Wed, 14 Oct 2009 00:05:58 +0000 (17:05 -0700)]
am
ea973630: am
d8b0b8c5: Clicking the analog clock widget launches the AlarmClock.
Merge commit '
ea97363036170c6b6112f9d9cf0f892084bb85c3'
* commit '
ea97363036170c6b6112f9d9cf0f892084bb85c3':
Clicking the analog clock widget launches the AlarmClock.
Patrick Scott [Tue, 13 Oct 2009 23:58:07 +0000 (16:58 -0700)]
am
fb701f78: am
d56e7ebb: Avoid a NPE in the monkey by checking for a null alarm.
Merge commit '
fb701f789c56222808c6964cd7b0225c7c65020b'
* commit '
fb701f789c56222808c6964cd7b0225c7c65020b':
Avoid a NPE in the monkey by checking for a null alarm.
Eric Fischer [Tue, 13 Oct 2009 23:30:41 +0000 (16:30 -0700)]
Reimport translations.
Change-Id: Ieae4a78cca4fb03dd8ed610b4131be1dc5fe1d45
Eric Fischer [Tue, 13 Oct 2009 23:04:30 +0000 (16:04 -0700)]
Import revised translations. DO NOT MERGE
Patrick Scott [Tue, 13 Oct 2009 21:29:23 +0000 (14:29 -0700)]
am
221a32be: am
bcfaaa6b: Post a runnable during configuration changes to avoid an ANR.
Merge commit '
221a32be786cb5946700c35707252b6ffa528f7e'
* commit '
221a32be786cb5946700c35707252b6ffa528f7e':
Post a runnable during configuration changes to avoid an ANR.
Patrick Scott [Tue, 13 Oct 2009 21:28:01 +0000 (14:28 -0700)]
am
e8091398: am
ba2f6090: Always enable the alarm when clicking done.
Merge commit '
e809139876c85353e34e808f31f227d4e4cc640a'
* commit '
e809139876c85353e34e808f31f227d4e4cc640a':
Always enable the alarm when clicking done.
Eric Fischer [Tue, 13 Oct 2009 19:04:16 +0000 (12:04 -0700)]
am
171b9a39: (-s ours) am
75e5015d: am
e8450e9c: (-s ours) am
eecd5bff: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
171b9a390b3ac2f746076065d20e187f45d7da55'
* commit '
171b9a390b3ac2f746076065d20e187f45d7da55':
Eric Fischer [Tue, 13 Oct 2009 19:04:13 +0000 (12:04 -0700)]
am
a31dabaf: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/AlarmClock into eclair-mr2-plus-aosp
Merge commit '
a31dabafe6f353a35dc32493e732a103252423f7'
* commit '
a31dabafe6f353a35dc32493e732a103252423f7':
Import revised translations. DO NOT MERGE
Patrick Scott [Tue, 13 Oct 2009 16:36:30 +0000 (09:36 -0700)]
am
d8b0b8c5: Clicking the analog clock widget launches the AlarmClock.
Merge commit '
d8b0b8c558f0c6d9acbb550fd5a014d7fb71b807' into eclair-mr2-plus-aosp
* commit '
d8b0b8c558f0c6d9acbb550fd5a014d7fb71b807':
Clicking the analog clock widget launches the AlarmClock.
Patrick Scott [Tue, 13 Oct 2009 13:06:14 +0000 (09:06 -0400)]
Clicking the analog clock widget launches the AlarmClock.
Bug:
2171549
Patrick Scott [Mon, 12 Oct 2009 18:27:07 +0000 (11:27 -0700)]
am
e98bc861: am
aa677789: Switch from dialog to fullscreen when the keyguard is showing.
Merge commit '
e98bc8611008adc95d439add97d5350e34b8d8fb'
* commit '
e98bc8611008adc95d439add97d5350e34b8d8fb':
Switch from dialog to fullscreen when the keyguard is showing.
Daisuke Miyakawa [Mon, 12 Oct 2009 18:27:01 +0000 (11:27 -0700)]
am
672407d0: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/AlarmClock into eclair-mr2-plus-aosp
Merge commit '
672407d09d2562caa8c13436e41acb8a0b701294'
* commit '
672407d09d2562caa8c13436e41acb8a0b701294':
Mike Cleron [Mon, 12 Oct 2009 18:24:44 +0000 (11:24 -0700)]
Daniel Sandler [Mon, 12 Oct 2009 18:24:41 +0000 (11:24 -0700)]
Patrick Scott [Mon, 12 Oct 2009 17:29:40 +0000 (10:29 -0700)]
am
d56e7ebb: Avoid a NPE in the monkey by checking for a null alarm.
Merge commit '
d56e7ebbe8c65b2150214eb3254d36226c1c42a6' into eclair-mr2-plus-aosp
* commit '
d56e7ebbe8c65b2150214eb3254d36226c1c42a6':
Avoid a NPE in the monkey by checking for a null alarm.
Patrick Scott [Mon, 12 Oct 2009 12:35:36 +0000 (08:35 -0400)]
Avoid a NPE in the monkey by checking for a null alarm.
Patrick Scott [Fri, 9 Oct 2009 17:04:37 +0000 (10:04 -0700)]
am
bcfaaa6b: Post a runnable during configuration changes to avoid an ANR.
Merge commit '
bcfaaa6b567b95df64499c2a2e3c15780438a2dc' into eclair-mr2-plus-aosp
* commit '
bcfaaa6b567b95df64499c2a2e3c15780438a2dc':
Post a runnable during configuration changes to avoid an ANR.
Patrick Scott [Fri, 9 Oct 2009 16:14:51 +0000 (12:14 -0400)]
Post a runnable during configuration changes to avoid an ANR.
Doing a relayout of the screen causes a lot of things to happen. One of which is
the analog clock registers a broadcast receiver.
Do a little cleanup as well.
Patrick Scott [Fri, 9 Oct 2009 13:13:20 +0000 (06:13 -0700)]
am
ba2f6090: Always enable the alarm when clicking done.
Merge commit '
ba2f609058d9526625c35cc80ad20c3b84722754' into eclair-mr2-plus-aosp
* commit '
ba2f609058d9526625c35cc80ad20c3b84722754':
Always enable the alarm when clicking done.
Patrick Scott [Fri, 9 Oct 2009 13:04:25 +0000 (09:04 -0400)]
Always enable the alarm when clicking done.
Bug:
2173934
Eric Fischer [Fri, 9 Oct 2009 00:52:25 +0000 (17:52 -0700)]
am
75e5015d: am
e8450e9c: (-s ours) am
eecd5bff: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
75e5015d928631fed02862d7fa3abf56e0a6f11c' into eclair-mr2-plus-aosp
* commit '
75e5015d928631fed02862d7fa3abf56e0a6f11c':
Eric Fischer [Fri, 9 Oct 2009 00:52:25 +0000 (17:52 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/AlarmClock into eclair-mr2-plus-aosp
Eric Fischer [Fri, 9 Oct 2009 00:33:25 +0000 (17:33 -0700)]
am
e8450e9c: (-s ours) am
eecd5bff: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
e8450e9c861ebd82f10ca50863017854e96a882e' into eclair-mr2
* commit '
e8450e9c861ebd82f10ca50863017854e96a882e':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Oct 2009 22:13:54 +0000 (15:13 -0700)]
am
e8450e9c: am
eecd5bff: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
e8450e9c861ebd82f10ca50863017854e96a882e' into eclair-plus-aosp
* commit '
e8450e9c861ebd82f10ca50863017854e96a882e':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Oct 2009 22:00:21 +0000 (15:00 -0700)]
am
eecd5bff: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
eecd5bff15281c7feec9c9cb9b86157ec5e7d46e' into eclair
* commit '
eecd5bff15281c7feec9c9cb9b86157ec5e7d46e':
Import revised translations. DO NOT MERGE
Mike Cleron [Wed, 7 Oct 2009 18:38:37 +0000 (11:38 -0700)]
am
f150fa8a: Merge change If8d2e944 into eclair
Merge commit '
f150fa8ad061efee81604f422eaaaf1579494a6d' into eclair-plus-aosp
* commit '
f150fa8ad061efee81604f422eaaaf1579494a6d':
Icons again
Daniel Sandler [Wed, 7 Oct 2009 18:38:29 +0000 (11:38 -0700)]
am
b348a187: Remove superfluous icon.
Merge commit '
b348a187b70cf3d95c6394622055c2000ee5fc53' into eclair-plus-aosp
* commit '
b348a187b70cf3d95c6394622055c2000ee5fc53':
Remove superfluous icon.
Patrick Scott [Mon, 5 Oct 2009 17:13:17 +0000 (10:13 -0700)]
am
aa677789: Switch from dialog to fullscreen when the keyguard is showing.
Merge commit '
aa67778949c2506c7e66f37b1baeef4fc2f1ab27' into eclair-mr2-plus-aosp
* commit '
aa67778949c2506c7e66f37b1baeef4fc2f1ab27':
Switch from dialog to fullscreen when the keyguard is showing.
Daisuke Miyakawa [Mon, 5 Oct 2009 17:13:17 +0000 (10:13 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/AlarmClock into eclair-mr2-plus-aosp
Patrick Scott [Mon, 5 Oct 2009 13:00:14 +0000 (09:00 -0400)]
Switch from dialog to fullscreen when the keyguard is showing.
Make AlarmAlert derive from AlarmAlertFullScreen. This looks like a massive
change but it is mostly a rename. Use a broadcast receiver to listen for the
screen turning off. Attempt to read the keyguard status up to 5 times in order
to launch the fullscreen activity. Add "screen_off" to the intent extras to
indicate that the intent is from the screen_off broadcast and to not wake the
screen.
The overall goal of this is that if the alarm fires while the device is on and
the user turns the screen off and then on, the full screen alert will show so
that the user can dismiss the alert.
Android (Google) Code Review [Fri, 2 Oct 2009 14:43:25 +0000 (10:43 -0400)]
Merge change If8d2e944 into eclair
* changes:
Icons again
Mike Cleron [Fri, 2 Oct 2009 07:28:57 +0000 (00:28 -0700)]
Icons again
Dianne Hackborn [Thu, 1 Oct 2009 21:01:27 +0000 (14:01 -0700)]
am
e1f50f57: am
777585c6: Fix issue #
2154688: when alarm rings ,device does not wake up...
Merge commit '
e1f50f57b1b321884271c8d03635fbad20dca260'
* commit '
e1f50f57b1b321884271c8d03635fbad20dca260':
Fix issue #
2154688: when alarm rings ,device does not wake up...
Patrick Scott [Thu, 1 Oct 2009 19:15:34 +0000 (12:15 -0700)]
am
bb40d6ca: am
0e14f840: Merge change I7495b004 into eclair
Merge commit '
bb40d6cac8d1dc0f361a8c55108684128595f9f2'
* commit '
bb40d6cac8d1dc0f361a8c55108684128595f9f2':
Pressing back will now save the alarm similar to how donut behaves.
Mike Cleron [Thu, 1 Oct 2009 18:58:06 +0000 (11:58 -0700)]
Daniel Sandler [Thu, 1 Oct 2009 18:55:57 +0000 (11:55 -0700)]
am
920e4030: am
99f4af14: Updated AlarmClock hdpi graphics.
Merge commit '
920e4030c3bf383d2702859efcf623a9650ec042'
* commit '
920e4030c3bf383d2702859efcf623a9650ec042':
Updated AlarmClock hdpi graphics.
Patrick Scott [Thu, 1 Oct 2009 18:17:02 +0000 (11:17 -0700)]
am
f92b7a5e: am
511c3514: Merge change I3105cddf into eclair
Merge commit '
f92b7a5e9acbc22ca699c8da7261778f310be48c'
* commit '
f92b7a5e9acbc22ca699c8da7261778f310be48c':
Use onStartCommand since onStart is deprecated.
Mike Cleron [Thu, 1 Oct 2009 18:15:35 +0000 (11:15 -0700)]
Daniel Sandler [Thu, 1 Oct 2009 15:11:46 +0000 (11:11 -0400)]
Remove superfluous icon.
Use old Cupcake icon as mdpi until we get a proper mdpi version of the new
icon.
Change-Id: I5bbd624a77ab5b37570f10b2159198683b09f3a3
Dianne Hackborn [Thu, 1 Oct 2009 11:56:54 +0000 (04:56 -0700)]
am
777585c6: Fix issue #
2154688: when alarm rings ,device does not wake up...
Merge commit '
777585c68d7bfa7bae7a928f53e27e471300bf7c' into eclair-plus-aosp
* commit '
777585c68d7bfa7bae7a928f53e27e471300bf7c':
Fix issue #
2154688: when alarm rings ,device does not wake up...
Dianne Hackborn [Thu, 1 Oct 2009 04:04:44 +0000 (21:04 -0700)]
Fix issue #
2154688: when alarm rings ,device does not wake up...
...and can't see Dismiss and Snooze button if the device is on dock
Change-Id: Ib76b54f0a65930e142a3da1e1152f70d7f3ad3c7
Explanation: only the fullscreen alarm activity had the flags set to turn on
the screen and dismiss the lock screen. The app picks whether to show
that one or the non-fullscreen one based on whether device is currently
locked, which is correct, but with the introduction of docks, locked
!= screen off. In particular, the desk dock keeps the keyguard dismissed
while the device is in it.
The fix is to just set these flags for both alert activities. That seems
generally right for many reasons.
Patrick Scott [Wed, 30 Sep 2009 19:30:59 +0000 (12:30 -0700)]
am
0e14f840: Merge change I7495b004 into eclair
Merge commit '
0e14f8406686953debc5087047df5f6654023da7' into eclair-plus-aosp
* commit '
0e14f8406686953debc5087047df5f6654023da7':
Pressing back will now save the alarm similar to how donut behaves.
Android (Google) Code Review [Wed, 30 Sep 2009 19:23:13 +0000 (15:23 -0400)]
Merge change I7495b004 into eclair
* changes:
Pressing back will now save the alarm similar to how donut behaves.
Patrick Scott [Wed, 30 Sep 2009 19:05:55 +0000 (15:05 -0400)]
Pressing back will now save the alarm similar to how donut behaves.
Do not pop the toast unless the alarm is enabled. Keep the enabled state when
saving the alarm unless the time has changed.
Mike Cleron [Wed, 30 Sep 2009 16:13:26 +0000 (09:13 -0700)]
am
5936eeaa: Merge change Ie77b0e71 into eclair
Merge commit '
5936eeaa35de736fb7a0931298946fd5606d0256' into eclair-plus-aosp
* commit '
5936eeaa35de736fb7a0931298946fd5606d0256':
Newer icons
Android (Google) Code Review [Wed, 30 Sep 2009 16:05:31 +0000 (12:05 -0400)]
Merge change Ie77b0e71 into eclair
* changes:
Newer icons
Daniel Sandler [Wed, 30 Sep 2009 13:14:19 +0000 (06:14 -0700)]
am
99f4af14: Updated AlarmClock hdpi graphics.
Merge commit '
99f4af142a86125fd16b3df9b165f3223c2e4e29' into eclair-plus-aosp
* commit '
99f4af142a86125fd16b3df9b165f3223c2e4e29':
Updated AlarmClock hdpi graphics.
Daniel Sandler [Wed, 30 Sep 2009 12:55:05 +0000 (08:55 -0400)]
Updated AlarmClock hdpi graphics.
Change-Id: Icd93c45ac7431434328d9a737979e057285e0e40
Mike Cleron [Wed, 30 Sep 2009 08:08:16 +0000 (01:08 -0700)]
Newer icons
Eric Fischer [Tue, 29 Sep 2009 23:40:14 +0000 (16:40 -0700)]
Import revised translations. DO NOT MERGE
Patrick Scott [Tue, 29 Sep 2009 18:25:28 +0000 (11:25 -0700)]
am
511c3514: Merge change I3105cddf into eclair
Merge commit '
511c35144c8e976bb75f6c066f7c3a2ebbbc83b8' into eclair-plus-aosp
* commit '
511c35144c8e976bb75f6c066f7c3a2ebbbc83b8':
Use onStartCommand since onStart is deprecated.
Android (Google) Code Review [Tue, 29 Sep 2009 18:19:46 +0000 (14:19 -0400)]
Merge change I3105cddf into eclair
* changes:
Use onStartCommand since onStart is deprecated.
Patrick Scott [Tue, 29 Sep 2009 15:21:24 +0000 (11:21 -0400)]
Use onStartCommand since onStart is deprecated.
If the intent is non-null and contains a valid alarm, return
START_STICKY.
Mike Cleron [Tue, 29 Sep 2009 17:54:05 +0000 (10:54 -0700)]