OSDN Git Service
Patrick Scott [Wed, 16 Dec 2009 18:52:31 +0000 (13:52 -0500)]
Check for null alarms and dismiss the snooze if the alarm is disabled.
If the alarm that is currently active is deleted, disable snoozing the alarm.
Bug:
2322130
Android Git Automerger [Tue, 15 Dec 2009 08:44:48 +0000 (00:44 -0800)]
Merge commit 'goog/eclair-plus-aosp'
Eric Fischer [Fri, 11 Dec 2009 20:26:02 +0000 (12:26 -0800)]
am
31db8c22: am
7468e218: Update lock screen alarm info when the locale changes.
Merge commit '
31db8c2298ed1bf32d8fd92fafef9c01f233d7df'
* commit '
31db8c2298ed1bf32d8fd92fafef9c01f233d7df':
Update lock screen alarm info when the locale changes.
Eric Fischer [Fri, 11 Dec 2009 20:23:43 +0000 (12:23 -0800)]
am
7468e218: Update lock screen alarm info when the locale changes.
Merge commit '
7468e2189eaba8303ae87a251f0179dadae26be8' into eclair-mr2-plus-aosp
* commit '
7468e2189eaba8303ae87a251f0179dadae26be8':
Update lock screen alarm info when the locale changes.
Eric Fischer [Thu, 10 Dec 2009 22:19:09 +0000 (14:19 -0800)]
Update lock screen alarm info when the locale changes.
http://b/issue?id=
2230029
Daniel Sandler [Fri, 11 Dec 2009 16:52:22 +0000 (08:52 -0800)]
am
d54b2c2a: am
f6e3c42e: Listen for weather update notifications instead of polling.
Merge commit '
d54b2c2af457df48b371a09b49134293599fb8f8'
* commit '
d54b2c2af457df48b371a09b49134293599fb8f8':
Listen for weather update notifications instead of polling.
Daniel Sandler [Fri, 11 Dec 2009 16:49:46 +0000 (08:49 -0800)]
am
f6e3c42e: Listen for weather update notifications instead of polling.
Merge commit '
f6e3c42ec2bfd7e3440393bd5a0d498a513574c5' into eclair-mr2-plus-aosp
* commit '
f6e3c42ec2bfd7e3440393bd5a0d498a513574c5':
Listen for weather update notifications instead of polling.
Daniel Sandler [Thu, 10 Dec 2009 17:15:16 +0000 (12:15 -0500)]
Listen for weather update notifications instead of polling.
DeskClock still periodically requests updated information
from the weather content provider (as recommended by the
Genie team) but does so on an hourly schedule rather than
every 5 minutes.
Also addresses http://b/
2314820.
Daniel Sandler [Fri, 11 Dec 2009 16:45:43 +0000 (08:45 -0800)]
am
6101493f: am
80ff42c1: Re-schedule screen saver mode when returning to normal.
Merge commit '
6101493fdbb259278d3b004cbea108c1e165b305'
* commit '
6101493fdbb259278d3b004cbea108c1e165b305':
Re-schedule screen saver mode when returning to normal.
Daniel Sandler [Fri, 11 Dec 2009 16:45:40 +0000 (08:45 -0800)]
am
b3c8766c: am
e5b7da93: am
3d4de660: Dismiss the desk clock if it was launched by docking.
Merge commit '
b3c8766c7c4c7a1d0708084dd940ba3ebc1ddc34'
* commit '
b3c8766c7c4c7a1d0708084dd940ba3ebc1ddc34':
Dismiss the desk clock if it was launched by docking.
Daniel Sandler [Fri, 11 Dec 2009 16:40:20 +0000 (08:40 -0800)]
am
80ff42c1: Re-schedule screen saver mode when returning to normal.
Merge commit '
80ff42c1abf87a4e81cb422446412973b46a75bd' into eclair-mr2-plus-aosp
* commit '
80ff42c1abf87a4e81cb422446412973b46a75bd':
Re-schedule screen saver mode when returning to normal.
Daniel Sandler [Fri, 11 Dec 2009 16:40:17 +0000 (08:40 -0800)]
am
e5b7da93: am
3d4de660: Dismiss the desk clock if it was launched by docking.
Merge commit '
e5b7da9308d17c4d6720c012950c7922779435f7' into eclair-mr2-plus-aosp
* commit '
e5b7da9308d17c4d6720c012950c7922779435f7':
Dismiss the desk clock if it was launched by docking.
Daniel Sandler [Thu, 10 Dec 2009 18:05:40 +0000 (13:05 -0500)]
Re-schedule screen saver mode when returning to normal.
Fixes http://b/
2317620
Eric Fischer [Fri, 11 Dec 2009 07:41:49 +0000 (23:41 -0800)]
am
62c74426: (-s ours) am
23a30560: am
cda260fb: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
62c7442680b1535603753bf0f5a9667f4c48e2ca'
* commit '
62c7442680b1535603753bf0f5a9667f4c48e2ca':
Import revised translations. DO NOT MERGE
Daniel Sandler [Fri, 11 Dec 2009 07:41:46 +0000 (23:41 -0800)]
am
9aa8d8bc: (-s ours) am
15dc2e87: am
7e827aca: (-s ours) Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)
Merge commit '
9aa8d8bca640ba10f187c6b0f561a9d1efb22ad6'
* commit '
9aa8d8bca640ba10f187c6b0f561a9d1efb22ad6':
Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)
Daniel Sandler [Fri, 11 Dec 2009 07:17:14 +0000 (23:17 -0800)]
am
3d4de660: Dismiss the desk clock if it was launched by docking.
Merge commit '
3d4de660d654fee760cf96f609198489e4d6525d' into eclair-mr2
* commit '
3d4de660d654fee760cf96f609198489e4d6525d':
Dismiss the desk clock if it was launched by docking.
Daniel Sandler [Fri, 11 Dec 2009 07:16:25 +0000 (23:16 -0800)]
am
3d4de660: Dismiss the desk clock if it was launched by docking.
Merge commit '
3d4de660d654fee760cf96f609198489e4d6525d' into eclair-plus-aosp
* commit '
3d4de660d654fee760cf96f609198489e4d6525d':
Dismiss the desk clock if it was launched by docking.
Daniel Sandler [Fri, 11 Dec 2009 07:07:36 +0000 (02:07 -0500)]
Dismiss the desk clock if it was launched by docking.
In other words: if the clock is behaving like a dock app
(launched by a dock event), it should finish() when the
device is removed from the dock. If, on the other hand,
it's behaving like a regular app (launched from the
Launcher), it should ignore an un-dock event.
This change also removes support for entering the desk dock
via a dialer code (an unnecessary feature since the app can
always be invoked from the Launcher).
Fixes http://b/
2302215, approved by hiroshi.
Eric Fischer [Fri, 11 Dec 2009 01:53:50 +0000 (17:53 -0800)]
am
23a30560: am
cda260fb: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
23a305607e907ae0b6644393330420f31867c512' into eclair-mr2-plus-aosp
* commit '
23a305607e907ae0b6644393330420f31867c512':
Import revised translations. DO NOT MERGE
Daniel Sandler [Fri, 11 Dec 2009 01:53:47 +0000 (17:53 -0800)]
am
15dc2e87: am
7e827aca: (-s ours) Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)
Merge commit '
15dc2e871248c51ecfe0aa527e8b04d2153620b9' into eclair-mr2-plus-aosp
* commit '
15dc2e871248c51ecfe0aa527e8b04d2153620b9':
Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)
Eric Fischer [Fri, 11 Dec 2009 01:43:21 +0000 (17:43 -0800)]
am
cda260fb: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
cda260fb9e42d1a470ec0040bd325a97261c88dd' into eclair-mr2
* commit '
cda260fb9e42d1a470ec0040bd325a97261c88dd':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Dec 2009 02:07:14 +0000 (18:07 -0800)]
am
cda260fb: Import revised translations. DO NOT MERGE
Merge commit '
cda260fb9e42d1a470ec0040bd325a97261c88dd' into eclair-plus-aosp
* commit '
cda260fb9e42d1a470ec0040bd325a97261c88dd':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Dec 2009 01:25:36 +0000 (17:25 -0800)]
Import revised translations. DO NOT MERGE
Daniel Sandler [Tue, 8 Dec 2009 16:03:16 +0000 (08:03 -0800)]
am
7e827aca: (-s ours) Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)
Merge commit '
7e827acae69298441b970262a309a957c92da155' into eclair-mr2
* commit '
7e827acae69298441b970262a309a957c92da155':
Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)
Daniel Sandler [Tue, 8 Dec 2009 16:02:16 +0000 (08:02 -0800)]
am
7e827aca: Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)
Merge commit '
7e827acae69298441b970262a309a957c92da155' into eclair-plus-aosp
* commit '
7e827acae69298441b970262a309a957c92da155':
Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)
Daniel Sandler [Thu, 3 Dec 2009 16:44:30 +0000 (11:44 -0500)]
Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)
Fixes http://b/
2301604
Daniel Sandler [Mon, 7 Dec 2009 22:30:26 +0000 (14:30 -0800)]
Daniel Sandler [Fri, 4 Dec 2009 20:25:43 +0000 (12:25 -0800)]
am
801fd314: am
c1d449d0: (-s ours) Fix b/
2305223 (DO NOT MERGE)
Merge commit '
801fd314c77c1e03c34a5172377202d3e28bd4c9' into eclair-mr2-plus-aosp
* commit '
801fd314c77c1e03c34a5172377202d3e28bd4c9':
Fix http://b/
2305223 (DO NOT MERGE)
Daniel Sandler [Fri, 4 Dec 2009 20:23:54 +0000 (12:23 -0800)]
am
c1d449d0: Fix http://b/
2305223 (DO NOT MERGE)
Merge commit '
c1d449d071703d3c2b8c4d9961e812b4632b5c90' into eclair-plus-aosp
* commit '
c1d449d071703d3c2b8c4d9961e812b4632b5c90':
Fix http://b/
2305223 (DO NOT MERGE)
Daniel Sandler [Fri, 4 Dec 2009 20:23:41 +0000 (12:23 -0800)]
am
c1d449d0: (-s ours) Fix b/
2305223 (DO NOT MERGE)
Merge commit '
c1d449d071703d3c2b8c4d9961e812b4632b5c90' into eclair-mr2
* commit '
c1d449d071703d3c2b8c4d9961e812b4632b5c90':
Fix http://b/
2305223 (DO NOT MERGE)
Daniel Sandler [Fri, 4 Dec 2009 19:47:03 +0000 (14:47 -0500)]
Fix http://b/
2305223 (DO NOT MERGE)
When placed into night mode (dim mode), the DeskClock must
restore full brightness any time the user returns to it from
another activity. There are two reasons for this:
1. The other activity won't be dim, so it's sort of jarring
to return to an almost-black screen.
2. As indicated in bug
2305223, visiting another activity is
a useful way to restore the display if it's so dark that
you can't see it to find the nightmode toggle button
(e.g., ambient lighting is very bright).
Daniel Sandler [Fri, 4 Dec 2009 19:40:30 +0000 (11:40 -0800)]
Daniel Sandler [Fri, 4 Dec 2009 19:40:27 +0000 (11:40 -0800)]
am
04b4fd66: am
1f385956: Show a long dash instead of 0° if no temperature is available.
Merge commit '
04b4fd6612b4cb3a7e8c5531eae6022b22eeb5f7'
* commit '
04b4fd6612b4cb3a7e8c5531eae6022b22eeb5f7':
Show a long dash instead of 0° if no temperature is available.
Daniel Sandler [Fri, 4 Dec 2009 19:37:05 +0000 (11:37 -0800)]
Daniel Sandler [Fri, 4 Dec 2009 19:37:01 +0000 (11:37 -0800)]
am
1f385956: Show a long dash instead of 0° if no temperature is available.
Merge commit '
1f385956ce5ae6dbe9ede0b0a4869eeff007041d' into eclair-mr2-plus-aosp
* commit '
1f385956ce5ae6dbe9ede0b0a4869eeff007041d':
Show a long dash instead of 0° if no temperature is available.
Daniel Sandler [Fri, 4 Dec 2009 19:20:18 +0000 (14:20 -0500)]
Fix http://b/
2305223
When placed into night mode (dim mode), the DeskClock must
restore full brightness any time the user returns to it from
another activity. There are two reasons for this:
1. The other activity won't be dim, so it's sort of jarring
to return to an almost-black screen.
2. As indicated in bug
2305223, visiting another activity is
a useful way to restore the display if it's so dark that
you can't see it to find the nightmode toggle button
(e.g., ambient lighting is very bright).
Daniel Sandler [Thu, 3 Dec 2009 16:44:30 +0000 (11:44 -0500)]
Show a long dash instead of 0° if no temperature is available.
Fixes http://b/
2301604
Eric Fischer [Thu, 3 Dec 2009 04:40:54 +0000 (20:40 -0800)]
am
e0f3a29c: (-s ours) am
1c0bdeef: am
630cb4aa: (-s ours) Merge change Iabe6771c into eclair
Merge commit '
e0f3a29c2962e6abca8a8735d7d3f08391b9ab94'
* commit '
e0f3a29c2962e6abca8a8735d7d3f08391b9ab94':
Import revised translations. DO NOT MERGE
Daniel Sandler [Thu, 3 Dec 2009 04:40:51 +0000 (20:40 -0800)]
am
b054d81b: am
6b98d006: am
1196a729: Merge change I63863614 into eclair
Merge commit '
b054d81b5e6d84dfd9e37dce750e6c51a4a8e40f'
* commit '
b054d81b5e6d84dfd9e37dce750e6c51a4a8e40f':
Continued UI fit-and-finish for DeskClock.
Daniel Sandler [Thu, 3 Dec 2009 04:35:42 +0000 (20:35 -0800)]
am
aa4d5e67: am
44c3bfe2: am
a405d7d1: Merge change I0a8adab9 into eclair
Merge commit '
aa4d5e67ca394fe89f2bc9cbccceb76dca0116ca'
* commit '
aa4d5e67ca394fe89f2bc9cbccceb76dca0116ca':
Reduce screen saver delay to 5 min.
Patrick Scott [Thu, 3 Dec 2009 04:30:35 +0000 (20:30 -0800)]
Patrick Scott [Thu, 3 Dec 2009 04:20:15 +0000 (20:20 -0800)]
am
49d9aef1: am
c3f77cc1: resolved conflicts for merge of
90c4833f to eclair-mr2
Merge commit '
49d9aef1f4054aa9d6f4d69b850285cccaef9428'
* commit '
49d9aef1f4054aa9d6f4d69b850285cccaef9428':
UI changes based on feedback from Jeff and Amar.
Eric Fischer [Wed, 2 Dec 2009 23:21:24 +0000 (15:21 -0800)]
am
1c0bdeef: am
630cb4aa: (-s ours) Merge change Iabe6771c into eclair
Merge commit '
1c0bdeef8daf13aab06143f11c9827467a8ce973' into eclair-mr2-plus-aosp
* commit '
1c0bdeef8daf13aab06143f11c9827467a8ce973':
Import revised translations. DO NOT MERGE
Daniel Sandler [Wed, 2 Dec 2009 23:21:21 +0000 (15:21 -0800)]
am
6b98d006: am
1196a729: Merge change I63863614 into eclair
Merge commit '
6b98d00684df51bc0004446215944ff491c0b75a' into eclair-mr2-plus-aosp
* commit '
6b98d00684df51bc0004446215944ff491c0b75a':
Continued UI fit-and-finish for DeskClock.
Eric Fischer [Wed, 2 Dec 2009 23:11:59 +0000 (15:11 -0800)]
am
630cb4aa: (-s ours) Merge change Iabe6771c into eclair
Merge commit '
630cb4aa77ef52c15295b0ffb4b9ec966b516fa7' into eclair-mr2
* commit '
630cb4aa77ef52c15295b0ffb4b9ec966b516fa7':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 23:09:45 +0000 (15:09 -0800)]
am
630cb4aa: Merge change Iabe6771c into eclair
Merge commit '
630cb4aa77ef52c15295b0ffb4b9ec966b516fa7' into eclair-plus-aosp
* commit '
630cb4aa77ef52c15295b0ffb4b9ec966b516fa7':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Wed, 2 Dec 2009 23:02:42 +0000 (15:02 -0800)]
Merge change Iabe6771c into eclair
* changes:
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 22:56:13 +0000 (14:56 -0800)]
Import revised translations. DO NOT MERGE
Daniel Sandler [Wed, 2 Dec 2009 20:54:47 +0000 (12:54 -0800)]
am
1196a729: Merge change I63863614 into eclair
Merge commit '
1196a729512ca9207c7d5af4862a830d412a68b7' into eclair-mr2
* commit '
1196a729512ca9207c7d5af4862a830d412a68b7':
Continued UI fit-and-finish for DeskClock.
Daniel Sandler [Wed, 2 Dec 2009 20:54:20 +0000 (12:54 -0800)]
am
1196a729: Merge change I63863614 into eclair
Merge commit '
1196a729512ca9207c7d5af4862a830d412a68b7' into eclair-plus-aosp
* commit '
1196a729512ca9207c7d5af4862a830d412a68b7':
Continued UI fit-and-finish for DeskClock.
Android (Google) Code Review [Wed, 2 Dec 2009 20:49:26 +0000 (12:49 -0800)]
Merge change I63863614 into eclair
* changes:
Continued UI fit-and-finish for DeskClock.
Daniel Sandler [Wed, 2 Dec 2009 20:08:29 +0000 (12:08 -0800)]
am
44c3bfe2: am
a405d7d1: Merge change I0a8adab9 into eclair
Merge commit '
44c3bfe294da8063f817c80b1f311e101a220b09' into eclair-mr2-plus-aosp
* commit '
44c3bfe294da8063f817c80b1f311e101a220b09':
Reduce screen saver delay to 5 min.
Daniel Sandler [Wed, 2 Dec 2009 20:05:38 +0000 (12:05 -0800)]
am
a405d7d1: Merge change I0a8adab9 into eclair
Merge commit '
a405d7d18cbc7a572a9fbde729bb4182a07c830f' into eclair-plus-aosp
* commit '
a405d7d18cbc7a572a9fbde729bb4182a07c830f':
Reduce screen saver delay to 5 min.
Daniel Sandler [Wed, 2 Dec 2009 20:04:50 +0000 (12:04 -0800)]
am
a405d7d1: Merge change I0a8adab9 into eclair
Merge commit '
a405d7d18cbc7a572a9fbde729bb4182a07c830f' into eclair-mr2
* commit '
a405d7d18cbc7a572a9fbde729bb4182a07c830f':
Reduce screen saver delay to 5 min.
Android (Google) Code Review [Wed, 2 Dec 2009 20:00:46 +0000 (12:00 -0800)]
Merge change I0a8adab9 into eclair
* changes:
Reduce screen saver delay to 5 min.
Patrick Scott [Wed, 2 Dec 2009 18:00:50 +0000 (10:00 -0800)]
am
1bf3f349: am
9bc32c62: Reverting this change to fix
2252466.
Merge commit '
1bf3f349dde2655325a8cca5a65e14b511f3749a' into eclair-mr2-plus-aosp
* commit '
1bf3f349dde2655325a8cca5a65e14b511f3749a':
Reverting this change to fix
2252466.
Patrick Scott [Wed, 2 Dec 2009 17:49:54 +0000 (09:49 -0800)]
am
9bc32c62: Reverting this change to fix
2252466.
Merge commit '
9bc32c622028a8de012438ccf8d207888d0ae8ba' into eclair-mr2
* commit '
9bc32c622028a8de012438ccf8d207888d0ae8ba':
Reverting this change to fix
2252466.
Patrick Scott [Wed, 2 Dec 2009 16:38:07 +0000 (08:38 -0800)]
am
9bc32c62: Reverting this change to fix
2252466.
Merge commit '
9bc32c622028a8de012438ccf8d207888d0ae8ba' into eclair-plus-aosp
* commit '
9bc32c622028a8de012438ccf8d207888d0ae8ba':
Reverting this change to fix
2252466.
Patrick Scott [Wed, 2 Dec 2009 13:28:32 +0000 (08:28 -0500)]
Reverting this change to fix
2252466.
Specifying multiple ringtone types makes the volume stream change to ringer
instead of alarm. This prevents the user from changing the alarm volume inside
the picker.
Patrick Scott [Wed, 2 Dec 2009 13:24:28 +0000 (05:24 -0800)]
am
c3f77cc1: resolved conflicts for merge of
90c4833f to eclair-mr2
Merge commit '
c3f77cc16633551c4daf1c160f4655762dda9a3b' into eclair-mr2-plus-aosp
* commit '
c3f77cc16633551c4daf1c160f4655762dda9a3b':
UI changes based on feedback from Jeff and Amar.
Patrick Scott [Wed, 2 Dec 2009 13:16:25 +0000 (08:16 -0500)]
resolved conflicts for merge of
90c4833f to eclair-mr2
Eric Fischer [Wed, 2 Dec 2009 01:40:12 +0000 (17:40 -0800)]
am
1d0c107a: (-s ours) am
527e80b4: am
77f3d897: (-s ours) Merge change I1afe6674 into eclair
Merge commit '
1d0c107a170d54bad76e477b5428f25a7217b9b8'
* commit '
1d0c107a170d54bad76e477b5428f25a7217b9b8':
Import revised translations. DO NOT MERGE
Eric Laurent [Wed, 2 Dec 2009 01:40:09 +0000 (17:40 -0800)]
am
1d322b80: am
0d5deb57: am
98379599: Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Merge commit '
1d322b809a816e43b45334f04abdf9229e8f51ae'
* commit '
1d322b809a816e43b45334f04abdf9229e8f51ae':
Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Eric Fischer [Wed, 2 Dec 2009 01:30:25 +0000 (17:30 -0800)]
am
527e80b4: am
77f3d897: (-s ours) Merge change I1afe6674 into eclair
Merge commit '
527e80b4b4395a6b205b4bc4a35f3004ec3702ce' into eclair-mr2-plus-aosp
* commit '
527e80b4b4395a6b205b4bc4a35f3004ec3702ce':
Import revised translations. DO NOT MERGE
Eric Laurent [Wed, 2 Dec 2009 01:30:21 +0000 (17:30 -0800)]
am
0d5deb57: am
98379599: Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Merge commit '
0d5deb5795c51cf112489c48e01ebb220ad0b6d1' into eclair-mr2-plus-aosp
* commit '
0d5deb5795c51cf112489c48e01ebb220ad0b6d1':
Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Eric Fischer [Wed, 2 Dec 2009 01:10:42 +0000 (17:10 -0800)]
am
77f3d897: (-s ours) Merge change I1afe6674 into eclair
Merge commit '
77f3d897765faaa640add814852c7b4ccee33655' into eclair-mr2
* commit '
77f3d897765faaa640add814852c7b4ccee33655':
Import revised translations. DO NOT MERGE
Eric Laurent [Wed, 2 Dec 2009 01:04:38 +0000 (17:04 -0800)]
am
98379599: Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Merge commit '
98379599e76b778ae7e281d69c3f8923fa50cb27' into eclair-mr2
* commit '
98379599e76b778ae7e281d69c3f8923fa50cb27':
Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Daniel Sandler [Tue, 1 Dec 2009 22:23:59 +0000 (17:23 -0500)]
Reduce screen saver delay to 5 min.
Discussion in http://b/
2282444 and http://b/
2227579
Patrick Scott [Tue, 1 Dec 2009 13:15:37 +0000 (05:15 -0800)]
am
90c4833f: UI changes based on feedback from Jeff and Amar.
Merge commit '
90c4833f94f4775f747333f8bd67107364a1d9c1' into eclair-plus-aosp
* commit '
90c4833f94f4775f747333f8bd67107364a1d9c1':
UI changes based on feedback from Jeff and Amar.
Patrick Scott [Mon, 23 Nov 2009 19:46:44 +0000 (14:46 -0500)]
UI changes based on feedback from Jeff and Amar.
Bug:
2278206
Eric Fischer [Mon, 30 Nov 2009 20:01:13 +0000 (12:01 -0800)]
am
77f3d897: Merge change I1afe6674 into eclair
Merge commit '
77f3d897765faaa640add814852c7b4ccee33655' into eclair-plus-aosp
* commit '
77f3d897765faaa640add814852c7b4ccee33655':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Mon, 30 Nov 2009 19:55:43 +0000 (11:55 -0800)]
Merge change I1afe6674 into eclair
* changes:
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 30 Nov 2009 19:35:47 +0000 (11:35 -0800)]
Import revised translations. DO NOT MERGE
Eric Laurent [Mon, 30 Nov 2009 18:05:59 +0000 (10:05 -0800)]
am
98379599: Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Merge commit '
98379599e76b778ae7e281d69c3f8923fa50cb27' into eclair-plus-aosp
* commit '
98379599e76b778ae7e281d69c3f8923fa50cb27':
Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Eric Laurent [Fri, 27 Nov 2009 13:10:54 +0000 (05:10 -0800)]
Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Do not play alarms if alarm stream volume is 0.
Daniel Sandler [Mon, 23 Nov 2009 21:00:02 +0000 (16:00 -0500)]
Continued UI fit-and-finish for DeskClock.
Bug: http://b/
2278197
Mike Lockwood [Mon, 23 Nov 2009 20:32:35 +0000 (12:32 -0800)]
am
c2150d85: am
15b30537: Turn off button and keyboard backlights when dimming the screen.
Merge commit '
c2150d85a6ba9b6e43884ad344f48d83facae445'
* commit '
c2150d85a6ba9b6e43884ad344f48d83facae445':
Turn off button and keyboard backlights when dimming the screen.
Daniel Sandler [Mon, 23 Nov 2009 20:32:31 +0000 (12:32 -0800)]
am
44d196db: am
4d52065d: am
ddacabc2: Add "add alarm" menu to the DeskClock activity.
Merge commit '
44d196dbe0da5b5c7a9628189d333b0c78ee8a59'
* commit '
44d196dbe0da5b5c7a9628189d333b0c78ee8a59':
Add "add alarm" menu to the DeskClock activity.
Mike Lockwood [Mon, 23 Nov 2009 20:28:19 +0000 (12:28 -0800)]
am
15b30537: Turn off button and keyboard backlights when dimming the screen.
Merge commit '
15b30537faa4bdcefafbd1a6744911ad33684492' into eclair-mr2-plus-aosp
* commit '
15b30537faa4bdcefafbd1a6744911ad33684492':
Turn off button and keyboard backlights when dimming the screen.
Daniel Sandler [Mon, 23 Nov 2009 20:28:15 +0000 (12:28 -0800)]
am
4d52065d: am
ddacabc2: Add "add alarm" menu to the DeskClock activity.
Merge commit '
4d52065d336a3e672bc192e66cc1ba5ece7a0035' into eclair-mr2-plus-aosp
* commit '
4d52065d336a3e672bc192e66cc1ba5ece7a0035':
Add "add alarm" menu to the DeskClock activity.
Mike Lockwood [Fri, 20 Nov 2009 16:31:49 +0000 (11:31 -0500)]
Turn off button and keyboard backlights when dimming the screen.
Change-Id: I35b0967cc611bcca2694d9bc8dbfd887d5c6061b
Signed-off-by: Mike Lockwood <lockwood@android.com>
Daniel Sandler [Mon, 23 Nov 2009 16:55:57 +0000 (08:55 -0800)]
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.
Daniel Sandler [Mon, 23 Nov 2009 16:55:26 +0000 (08:55 -0800)]
am
ddacabc2: Add "add alarm" menu to the DeskClock activity.
Merge commit '
ddacabc24b515db4fa6c7a289ef81d8050c8062c' into eclair-plus-aosp
* commit '
ddacabc24b515db4fa6c7a289ef81d8050c8062c':
Add "add alarm" menu to the DeskClock activity.
Daniel Sandler [Mon, 23 Nov 2009 16:37:05 +0000 (11:37 -0500)]
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 .
Patrick Scott [Fri, 20 Nov 2009 21:57:13 +0000 (13:57 -0800)]
am
d19d73ac: am
e4694b7b: am
aa378715: Asynchronously handle TIME_TICK to not block the broadcast.
Merge commit '
d19d73acdd32ee35f104187d64a3a43357c944df'
* commit '
d19d73acdd32ee35f104187d64a3a43357c944df':
Asynchronously handle TIME_TICK to not block the broadcast.
Patrick Scott [Fri, 20 Nov 2009 21:53:41 +0000 (13:53 -0800)]
am
e4694b7b: am
aa378715: Asynchronously handle TIME_TICK to not block the broadcast.
Merge commit '
e4694b7b9a862728e2dc57116fb4e1aa1e2ab9ef' into eclair-mr2-plus-aosp
* commit '
e4694b7b9a862728e2dc57116fb4e1aa1e2ab9ef':
Asynchronously handle TIME_TICK to not block the broadcast.
Patrick Scott [Fri, 20 Nov 2009 21:49:36 +0000 (13:49 -0800)]
am
aa378715: Asynchronously handle TIME_TICK to not block the broadcast.
Merge commit '
aa378715cf7b99264517250ac196c0fec7999d44' into eclair-mr2
* commit '
aa378715cf7b99264517250ac196c0fec7999d44':
Asynchronously handle TIME_TICK to not block the broadcast.
Patrick Scott [Fri, 20 Nov 2009 21:49:28 +0000 (13:49 -0800)]
am
aa378715: Asynchronously handle TIME_TICK to not block the broadcast.
Merge commit '
aa378715cf7b99264517250ac196c0fec7999d44' into eclair-plus-aosp
* commit '
aa378715cf7b99264517250ac196c0fec7999d44':
Asynchronously handle TIME_TICK to not block the broadcast.
Patrick Scott [Fri, 20 Nov 2009 01:39:45 +0000 (17:39 -0800)]
am
7ece3715: am
e24e0fb1: am
80124aa0: Make the alert layout a little better.
Merge commit '
7ece371517c21a7517064222917e7c3413f5281c'
* commit '
7ece371517c21a7517064222917e7c3413f5281c':
Make the alert layout a little better.
Patrick Scott [Fri, 20 Nov 2009 01:39:42 +0000 (17:39 -0800)]
am
b1686741: am
e941d235: am
bb4dbac9: Allow picking ringtones as alarm alerts.
Merge commit '
b1686741190a74a658340f0e3afc70f8332c8db1'
* commit '
b1686741190a74a658340f0e3afc70f8332c8db1':
Allow picking ringtones as alarm alerts.
Patrick Scott [Thu, 19 Nov 2009 21:06:27 +0000 (16:06 -0500)]
Asynchronously handle TIME_TICK to not block the broadcast.
BUG:
2268458
Patrick Scott [Thu, 19 Nov 2009 19:49:00 +0000 (11:49 -0800)]
am
e24e0fb1: am
80124aa0: Make the alert layout a little better.
Merge commit '
e24e0fb1006d3e75c1789b1e7b5f3424c20c835e' into eclair-mr2-plus-aosp
* commit '
e24e0fb1006d3e75c1789b1e7b5f3424c20c835e':
Make the alert layout a little better.
Patrick Scott [Thu, 19 Nov 2009 19:48:57 +0000 (11:48 -0800)]
am
e941d235: am
bb4dbac9: Allow picking ringtones as alarm alerts.
Merge commit '
e941d235e63b6a61cc52cc7bdcea1e544dd93035' into eclair-mr2-plus-aosp
* commit '
e941d235e63b6a61cc52cc7bdcea1e544dd93035':
Allow picking ringtones as alarm alerts.
Patrick Scott [Thu, 19 Nov 2009 19:41:21 +0000 (11:41 -0800)]
am
80124aa0: Make the alert layout a little better.
Merge commit '
80124aa02f01228f8726e8c972a5882e0f4d10d7' into eclair-mr2
* commit '
80124aa02f01228f8726e8c972a5882e0f4d10d7':
Make the alert layout a little better.
Patrick Scott [Thu, 19 Nov 2009 19:41:03 +0000 (11:41 -0800)]
am
bb4dbac9: Allow picking ringtones as alarm alerts.
Merge commit '
bb4dbac9655226b87502655c1fa7e8fca1357bf4' into eclair-mr2
* commit '
bb4dbac9655226b87502655c1fa7e8fca1357bf4':
Allow picking ringtones as alarm alerts.
Patrick Scott [Thu, 19 Nov 2009 17:30:07 +0000 (09:30 -0800)]
am
80124aa0: Make the alert layout a little better.
Merge commit '
80124aa02f01228f8726e8c972a5882e0f4d10d7' into eclair-plus-aosp
* commit '
80124aa02f01228f8726e8c972a5882e0f4d10d7':
Make the alert layout a little better.
Patrick Scott [Thu, 19 Nov 2009 17:03:36 +0000 (12:03 -0500)]
Make the alert layout a little better.
Align the time and am/pm text. Pad the alarm message a little more as well as
the time. Use standard colors and appearances for some of the text.
Patrick Scott [Thu, 19 Nov 2009 16:29:49 +0000 (08:29 -0800)]
am
bb4dbac9: Allow picking ringtones as alarm alerts.
Merge commit '
bb4dbac9655226b87502655c1fa7e8fca1357bf4' into eclair-plus-aosp
* commit '
bb4dbac9655226b87502655c1fa7e8fca1357bf4':
Allow picking ringtones as alarm alerts.
Patrick Scott [Thu, 19 Nov 2009 14:13:48 +0000 (09:13 -0500)]
Allow picking ringtones as alarm alerts.
The original request was for just a few of the ringtones but that really isn't
possible with the current framework. Media files are classified by what folder
they are transferred to during the build. It would be nice to have a way to
specify what media files should be allowed in the list of ringtones but for now,
I think it is ok to allow selecting any of the built-in ringtones.
Daniel Sandler [Wed, 18 Nov 2009 20:28:34 +0000 (12:28 -0800)]
am
1bcb34a8: am
43313e0d: am
b95b7a63: Myriad fixes & cleanups in DeskClock.
Merge commit '
1bcb34a892a99be7ef17dd1a156c389d6ce07670'
* commit '
1bcb34a892a99be7ef17dd1a156c389d6ce07670':
Myriad fixes & cleanups in DeskClock.
OSDN Git Service
