OSDN Git Service
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
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)]
Mike Cleron [Tue, 29 Sep 2009 06:42:54 +0000 (23:42 -0700)]
New icon
Dianne Hackborn [Wed, 23 Sep 2009 18:35:44 +0000 (11:35 -0700)]
am
0aaec70b: am
29dbeab9: Update to use new unlock APIs, new wallpaper theme.
Merge commit '
0aaec70ba2c2fcdd2734535f46cdc54efa91d730'
* commit '
0aaec70ba2c2fcdd2734535f46cdc54efa91d730':
Update to use new unlock APIs, new wallpaper theme.
Dianne Hackborn [Tue, 22 Sep 2009 21:43:55 +0000 (14:43 -0700)]
am
29dbeab9: Update to use new unlock APIs, new wallpaper theme.
Merge commit '
29dbeab977ead46e10efce114e1f21a55d556100' into eclair-plus-aosp
* commit '
29dbeab977ead46e10efce114e1f21a55d556100':
Update to use new unlock APIs, new wallpaper theme.
Dianne Hackborn [Tue, 22 Sep 2009 20:44:12 +0000 (13:44 -0700)]
Update to use new unlock APIs, new wallpaper theme.
Also don't allow the user to press back when in the full screen alarm.
Change-Id: Ic0c9658c75d3a2b3f49028f432fe226b1a0d8e9e
Patrick Scott [Fri, 18 Sep 2009 20:52:16 +0000 (13:52 -0700)]
am
8305ae30: am
98948f9c: Fix a couple race conditions with expired alarms.
Merge commit '
8305ae304fa701c6e1acd0424c2ad0de52512dbb'
* commit '
8305ae304fa701c6e1acd0424c2ad0de52512dbb':
Fix a couple race conditions with expired alarms.
Patrick Scott [Fri, 18 Sep 2009 20:46:36 +0000 (13:46 -0700)]
am
98948f9c: Fix a couple race conditions with expired alarms.
Merge commit '
98948f9ce1dabcc79350a847baf220635b0c087a' into eclair-plus-aosp
* commit '
98948f9ce1dabcc79350a847baf220635b0c087a':
Fix a couple race conditions with expired alarms.
Patrick Scott [Fri, 18 Sep 2009 20:02:09 +0000 (16:02 -0400)]
Fix a couple race conditions with expired alarms.
Log the alarm time in a pretty format for easier debugging. Disable expired
alarms when calculating the next alert. This solves 2 problems: an expired alarm
remains checked in the UI and the expired alarm is sent to the alarm manager. I
believe the second problem is causing bug
2080160.
Eric Fischer [Thu, 17 Sep 2009 21:58:59 +0000 (14:58 -0700)]
am
1aa5b003: (-s ours) am
e58c886f: Import revised translations. DO NOT MERGE
Merge commit '
1aa5b0031007fde71f000dfdcd6d5a01cdda605a'
* commit '
1aa5b0031007fde71f000dfdcd6d5a01cdda605a':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 21:54:10 +0000 (14:54 -0700)]
am
e58c886f: Import revised translations. DO NOT MERGE
Merge commit '
e58c886fcb0f1593a71e81ec5f28d610ac297700' into eclair-plus-aosp
* commit '
e58c886fcb0f1593a71e81ec5f28d610ac297700':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 21:28:38 +0000 (14:28 -0700)]
Import revised translations. DO NOT MERGE
Dianne Hackborn [Thu, 17 Sep 2009 16:56:59 +0000 (09:56 -0700)]
am
8ee444ff: am
53205356: Use new window manager flag for turning on the screen.
Merge commit '
8ee444ff6c041665db2527ead57aaa33bb319619'
* commit '
8ee444ff6c041665db2527ead57aaa33bb319619':
Use new window manager flag for turning on the screen.
Patrick Scott [Thu, 17 Sep 2009 13:33:17 +0000 (09:33 -0400)]
resolve conflicts for merge of
01b933d to master
Patrick Scott [Thu, 17 Sep 2009 12:26:53 +0000 (05:26 -0700)]
am
1a269113: am
6b74f6f5: Revert the AlarmAlert to a rotatable activity.
Merge commit '
1a26911316ccb2761a9539626c3bc2f30c365f31'
* commit '
1a26911316ccb2761a9539626c3bc2f30c365f31':
Revert the AlarmAlert to a rotatable activity.
Dianne Hackborn [Wed, 16 Sep 2009 18:22:26 +0000 (11:22 -0700)]
am
53205356: Use new window manager flag for turning on the screen.
Merge commit '
53205356eb422db2f3460425053c5fe4df8ceeda' into eclair-plus-aosp
* commit '
53205356eb422db2f3460425053c5fe4df8ceeda':
Use new window manager flag for turning on the screen.
Dianne Hackborn [Wed, 16 Sep 2009 05:58:50 +0000 (22:58 -0700)]
Use new window manager flag for turning on the screen.
This allows the alert to no longer deal with a full wake lock itself,
and allows the window manager to take care of not turning it on until
the activity's window is actually displayed.
Change-Id: I2c3529c3d12a5a9c9add71636ce958d3205832e8
Patrick Scott [Tue, 15 Sep 2009 16:52:24 +0000 (09:52 -0700)]
am
cf730740: Prevent leaking windows by listening for config changes.
Merge commit '
cf7307401797b159ca32f85e7cf38d18cececd0d' into eclair-plus-aosp
* commit '
cf7307401797b159ca32f85e7cf38d18cececd0d':
Prevent leaking windows by listening for config changes.
Patrick Scott [Tue, 15 Sep 2009 13:37:57 +0000 (09:37 -0400)]
Prevent leaking windows by listening for config changes.
Remove the old database sanity check as it will not happen. Remove the strings
associated with the db error as well. Update the layout of the AlarmClock
activity during configuration changes so that the activity is no longer
destroyed and leaking the delete alert.
Patrick Scott [Tue, 15 Sep 2009 15:07:36 +0000 (08:07 -0700)]
am
6b74f6f5: Revert the AlarmAlert to a rotatable activity.
Merge commit '
6b74f6f5a6d47fe80ce92c44444aebd3436937b2' into eclair-plus-aosp
* commit '
6b74f6f5a6d47fe80ce92c44444aebd3436937b2':
Revert the AlarmAlert to a rotatable activity.
Patrick Scott [Tue, 15 Sep 2009 12:00:09 +0000 (08:00 -0400)]
Revert the AlarmAlert to a rotatable activity.
Remove the orientation from the manifest. Edit the alarm_alert.xml layout to be
more accommodating to landscape. Add circle#_drawable.xml files that are
BitmapDrawables for the circle animation. This prevents the background animation
from being stretched to the view size.
Eric Fischer [Wed, 9 Sep 2009 17:56:26 +0000 (10:56 -0700)]
am
902f051f: (-s ours) am
9a1689a9: Import revised translations. DO NOT MERGE
Merge commit '
902f051f08177d3630f3fa406365fcf575795fa2'
* commit '
902f051f08177d3630f3fa406365fcf575795fa2':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Sep 2009 00:01:07 +0000 (17:01 -0700)]
am
9a1689a9: Import revised translations. DO NOT MERGE
Merge commit '
9a1689a91ea27270ea5222ae8b882210bfcbf9bb' into eclair-plus-aosp
* commit '
9a1689a91ea27270ea5222ae8b882210bfcbf9bb':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Sep 2009 23:24:23 +0000 (16:24 -0700)]
Import revised translations. DO NOT MERGE
Daniel Sandler [Fri, 4 Sep 2009 18:06:42 +0000 (11:06 -0700)]
am
83d418dd: am
196162c2: Restore alpha channel on clock hand.
Merge commit '
83d418dd226d13a9800e6523e4f61c17778751a3'
* commit '
83d418dd226d13a9800e6523e4f61c17778751a3':
Restore alpha channel on clock hand.
Jean-Baptiste Queru [Fri, 4 Sep 2009 18:06:16 +0000 (11:06 -0700)]
Daniel Sandler [Fri, 4 Sep 2009 16:08:42 +0000 (09:08 -0700)]
am
196162c2: Restore alpha channel on clock hand.
Merge commit '
196162c20ec18934fcf7ab14441e09347ab9a326' into eclair-plus-aosp
* commit '
196162c20ec18934fcf7ab14441e09347ab9a326':
Restore alpha channel on clock hand.
Daniel Sandler [Fri, 4 Sep 2009 15:37:37 +0000 (11:37 -0400)]
Restore alpha channel on clock hand.
Fixes http://b/
2091179 .
Jean-Baptiste Queru [Fri, 4 Sep 2009 14:51:15 +0000 (07:51 -0700)]
merge from open-source master
Jean-Baptiste Queru [Thu, 3 Sep 2009 21:13:12 +0000 (14:13 -0700)]
merge from donut
Patrick Scott [Thu, 3 Sep 2009 20:18:10 +0000 (13:18 -0700)]
Patrick Scott [Thu, 3 Sep 2009 20:13:26 +0000 (16:13 -0400)]
Fix a permission typo.
Patrick Scott [Thu, 3 Sep 2009 18:40:08 +0000 (11:40 -0700)]
am
1f66bd54: Kill the alarm when a call comes in.
Merge commit '
1f66bd549803234e705231147c7aa4f35717697a'
* commit '
1f66bd549803234e705231147c7aa4f35717697a':
Kill the alarm when a call comes in.
Patrick Scott [Thu, 3 Sep 2009 18:18:13 +0000 (14:18 -0400)]
Kill the alarm when a call comes in.
If the alarm fires while in a call, remember the call state since registering
for call state changes triggers onCallStateChanged and we don't want to kill the
alarm in that case.
Daniel Sandler [Mon, 31 Aug 2009 23:43:22 +0000 (16:43 -0700)]
am
12c57557: High-resolution (hdpi) artwork from TAT for AlarmClock.
Merge commit '
12c57557a503fed9c0d57ea9ee050ecaba763115'
* commit '
12c57557a503fed9c0d57ea9ee050ecaba763115':
High-resolution (hdpi) artwork from TAT for AlarmClock.
Daniel Sandler [Fri, 28 Aug 2009 18:51:55 +0000 (14:51 -0400)]
High-resolution (hdpi) artwork from TAT for AlarmClock.
Ed Heyl [Thu, 20 Aug 2009 23:56:08 +0000 (16:56 -0700)]
Ed Heyl [Thu, 20 Aug 2009 23:52:31 +0000 (16:52 -0700)]
Ed Heyl [Thu, 20 Aug 2009 23:41:05 +0000 (16:41 -0700)]
Eric Fischer [Thu, 20 Aug 2009 23:04:51 +0000 (16:04 -0700)]
am
92bfac82: (-s ours) am
7c65f0df: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
92bfac824ad7986239dfd830b008f595b617924e'
* commit '
92bfac824ad7986239dfd830b008f595b617924e':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 20 Aug 2009 23:00:34 +0000 (16:00 -0700)]
am
7c65f0df: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
7c65f0df157dd1e0a6dfba9c21057b8caa8cb2bc' into eclair
* commit '
7c65f0df157dd1e0a6dfba9c21057b8caa8cb2bc':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 20 Aug 2009 21:07:36 +0000 (14:07 -0700)]
Import revised translations. DO NOT MERGE
Patrick Scott [Wed, 19 Aug 2009 23:49:16 +0000 (16:49 -0700)]
am
aaeab75e: (-s ours) am
8d58816a: (-s ours) Do not merge. Revert "Do not merge."
Merge commit '
aaeab75eee4f56fe6c3b4809a4be556273463cf1'
* commit '
aaeab75eee4f56fe6c3b4809a4be556273463cf1':
Do not merge.
Patrick Scott [Wed, 19 Aug 2009 23:49:15 +0000 (16:49 -0700)]
am
67430f3d: Fix some copy-paste errors and acquire locks before launching the Activity.
Merge commit '
67430f3d25a103cf87ba72d4034e703107b715ee'
* commit '
67430f3d25a103cf87ba72d4034e703107b715ee':
Fix some copy-paste errors and acquire locks before launching the Activity.
Patrick Scott [Wed, 19 Aug 2009 21:30:27 +0000 (14:30 -0700)]
am
8d58816a: (-s ours) Do not merge. Revert "Do not merge."
Merge commit '
8d58816a7f2cf3b4de4c1932bbde39be7a489b82' into eclair
* commit '
8d58816a7f2cf3b4de4c1932bbde39be7a489b82':
Do not merge.
Patrick Scott [Wed, 19 Aug 2009 20:34:21 +0000 (16:34 -0400)]
Do not merge.
Revert "Do not merge."
This reverts commit
372cbb5437b209f6d909ea247080da6a48c3a590.
Patrick Scott [Wed, 19 Aug 2009 20:19:15 +0000 (16:19 -0400)]
Fix some copy-paste errors and acquire locks before launching the Activity.
Acquiring the locks before launching the Activity prevents some strange pausing
behavior in ActivityManager. If the screen is off, the ActivityManager attempts
to pause the Activity before resuming it.
Patrick Scott [Wed, 19 Aug 2009 18:15:52 +0000 (11:15 -0700)]
am
4b7cc175: (-s ours) am
372cbb54: (-s ours) Do not merge. Wake the screen before launching the AlarmAlert.
Merge commit '
4b7cc175917adc2ac20ecf5a63efad3273bc2059'
* commit '
4b7cc175917adc2ac20ecf5a63efad3273bc2059':
Do not merge.
Patrick Scott [Wed, 19 Aug 2009 18:12:27 +0000 (11:12 -0700)]
am
372cbb54: (-s ours) Do not merge. Wake the screen before launching the AlarmAlert.
Merge commit '
372cbb5437b209f6d909ea247080da6a48c3a590' into eclair
* commit '
372cbb5437b209f6d909ea247080da6a48c3a590':
Do not merge.
OSDN Git Service
