OSDN Git Service
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: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 [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
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.
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: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 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 [Mon, 23 Nov 2009 19:46:44 +0000 (14:46 -0500)]
UI changes based on feedback from Jeff and Amar.
Bug:
2278206
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 [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: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 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: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 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.
Patrick Scott [Wed, 18 Nov 2009 20:28:30 +0000 (12:28 -0800)]
am
edb044f9: am
62598e4e: am
f1e8069b: UI tweaks to meet Jeff\'s spec.
Merge commit '
edb044f9bb3d87ed521fc759ea62ae1b4fa932bf'
* commit '
edb044f9bb3d87ed521fc759ea62ae1b4fa932bf':
UI tweaks to meet Jeff's spec.
Daniel Sandler [Wed, 18 Nov 2009 20:25:22 +0000 (12:25 -0800)]
am
43313e0d: am
b95b7a63: Myriad fixes & cleanups in DeskClock.
Merge commit '
43313e0ddc772c0eb3818f5efbdc5bcddedde56a' into eclair-mr2-plus-aosp
* commit '
43313e0ddc772c0eb3818f5efbdc5bcddedde56a':
Myriad fixes & cleanups in DeskClock.
Patrick Scott [Wed, 18 Nov 2009 20:25:17 +0000 (12:25 -0800)]
am
62598e4e: am
f1e8069b: UI tweaks to meet Jeff\'s spec.
Merge commit '
62598e4eb795e56e06e0b20891be707b9fd11c15' into eclair-mr2-plus-aosp
* commit '
62598e4eb795e56e06e0b20891be707b9fd11c15':
UI tweaks to meet Jeff's spec.
Daniel Sandler [Wed, 18 Nov 2009 20:22:37 +0000 (12:22 -0800)]
am
b95b7a63: Myriad fixes & cleanups in DeskClock.
Merge commit '
b95b7a63c403a17c3725e1ccfbd65b4283fd6a0f' into eclair-mr2
* commit '
b95b7a63c403a17c3725e1ccfbd65b4283fd6a0f':
Myriad fixes & cleanups in DeskClock.
Patrick Scott [Wed, 18 Nov 2009 20:20:53 +0000 (12:20 -0800)]
am
f1e8069b: UI tweaks to meet Jeff\'s spec.
Merge commit '
f1e8069bcd1755d9ef2322b705d8d9d6b83728f0' into eclair-mr2
* commit '
f1e8069bcd1755d9ef2322b705d8d9d6b83728f0':
UI tweaks to meet Jeff's spec.
Daniel Sandler [Wed, 18 Nov 2009 19:21:01 +0000 (14:21 -0500)]
Myriad fixes & cleanups in DeskClock.
- Force the weather widget to actually fetch new data at
the moment the device is docked, or when the screensaver
disappears (if the device is plugged in).
- Use Intent.FLAG_ACTIVITY_CLEAR_TOP to launch weather,
music, and gallery to avoid jumping into the middle of
their task stacks (http://b/
2267831)
- Fix layout issues with weather, particularly when the
Genie widget is unavailable. (relates to
http://b/
2254472)
- Internationalize the error message shown when Genie
malfunctions.
- Clean up weather & time displays to match UX specs more
closely (fonts, shadow crop issues).
- Remove some tabs in XML.
- Internal cleanup: use "query" in the name of functions &
variables related to getting updated weather from Genie;
use "fetch" to refer to downloading new weather data from
the network
Patrick Scott [Wed, 18 Nov 2009 14:53:03 +0000 (09:53 -0500)]
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.
Patrick Scott [Tue, 17 Nov 2009 15:32:00 +0000 (07:32 -0800)]
am
7e65cf26: am
f6f1e5d2: resolved conflicts for merge of
e3f01aff to eclair-mr2
Merge commit '
7e65cf26fd707dcf733b4d1efaec99882b0cf0d8'
* commit '
7e65cf26fd707dcf733b4d1efaec99882b0cf0d8':
Finish the UI improvements for the alarm list.
Patrick Scott [Tue, 17 Nov 2009 15:31:57 +0000 (07:31 -0800)]
am
1db05dfd: am
7a46bb83: am
515f4384: Merge change Ic31f08c3 into eclair
Merge commit '
1db05dfd0c803e60f02715a24e43ff103bf267c0'
* commit '
1db05dfd0c803e60f02715a24e43ff103bf267c0':
Make the default ringtone selected in the list.
Patrick Scott [Tue, 17 Nov 2009 15:31:53 +0000 (07:31 -0800)]
am
6142aa5a: am
7e344f5d: resolved conflicts for merge of
4e1b06eb to eclair-mr2
Merge commit '
6142aa5a0e025d65b6a4d152e1570b31e0991c5c'
* commit '
6142aa5a0e025d65b6a4d152e1570b31e0991c5c':
New UI for the list of alarms.
Patrick Scott [Mon, 16 Nov 2009 22:41:39 +0000 (14:41 -0800)]
am
f6f1e5d2: resolved conflicts for merge of
e3f01aff to eclair-mr2
Merge commit '
f6f1e5d224b8522d6f62ece1dff4180b381f2a47' into eclair-mr2-plus-aosp
* commit '
f6f1e5d224b8522d6f62ece1dff4180b381f2a47':
Finish the UI improvements for the alarm list.
Patrick Scott [Mon, 16 Nov 2009 22:40:30 +0000 (14:40 -0800)]
am
7a46bb83: am
515f4384: Merge change Ic31f08c3 into eclair
Merge commit '
7a46bb83334a88c39c288f51196da424cbfb9adc' into eclair-mr2-plus-aosp
* commit '
7a46bb83334a88c39c288f51196da424cbfb9adc':
Make the default ringtone selected in the list.
Patrick Scott [Mon, 16 Nov 2009 22:39:21 +0000 (14:39 -0800)]
am
7e344f5d: resolved conflicts for merge of
4e1b06eb to eclair-mr2
Merge commit '
7e344f5d5bd60e275e4ccd87b6b34b1ae2c6d7d7' into eclair-mr2-plus-aosp
* commit '
7e344f5d5bd60e275e4ccd87b6b34b1ae2c6d7d7':
New UI for the list of alarms.
Patrick Scott [Mon, 16 Nov 2009 21:23:49 +0000 (16:23 -0500)]
resolved conflicts for merge of
e3f01aff to eclair-mr2
Patrick Scott [Mon, 16 Nov 2009 21:11:32 +0000 (16:11 -0500)]
Finish the UI improvements for the alarm list.
Patrick Scott [Mon, 16 Nov 2009 19:32:11 +0000 (11:32 -0800)]
am
515f4384: Merge change Ic31f08c3 into eclair
Merge commit '
515f43840b8404b1ad2ef95c0e9704a26c248647' into eclair-mr2
* commit '
515f43840b8404b1ad2ef95c0e9704a26c248647':
Make the default ringtone selected in the list.
Patrick Scott [Mon, 16 Nov 2009 19:28:05 +0000 (14:28 -0500)]
resolved conflicts for merge of
4e1b06eb to eclair-mr2
Android (Google) Code Review [Mon, 16 Nov 2009 19:10:02 +0000 (11:10 -0800)]
Merge change Ic31f08c3 into eclair
* changes:
Make the default ringtone selected in the list.
Patrick Scott [Mon, 16 Nov 2009 16:56:04 +0000 (11:56 -0500)]
Make the default ringtone selected in the list.
Bug:
2260622
Patrick Scott [Mon, 16 Nov 2009 12:50:20 +0000 (07:50 -0500)]
New UI for the list of alarms.
Still need to put the "Add alarm" item at the top and the clock at the bottom.
Jean-Baptiste Queru [Sun, 15 Nov 2009 23:10:06 +0000 (15:10 -0800)]
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:55:24 +0000 (14:55 -0800)]
merge from open-source master
Eric Fischer [Sat, 14 Nov 2009 01:58:35 +0000 (17:58 -0800)]
am
227769fe: (-s ours) am
a092e9b2: am
33137d79: (-s ours) Merge change Ia9f7e629 into eclair
Merge commit '
227769fe57537816955c8ce9518efb38b54fc217'
* commit '
227769fe57537816955c8ce9518efb38b54fc217':
Import revised translations. DO NOT MERGE
Daniel Sandler [Sat, 14 Nov 2009 01:58:30 +0000 (17:58 -0800)]
Eric Fischer [Sat, 14 Nov 2009 01:52:32 +0000 (17:52 -0800)]
am
a092e9b2: am
33137d79: (-s ours) Merge change Ia9f7e629 into eclair
Merge commit '
a092e9b25c45bfca849ffdd2bad3c65c8a29346e' into eclair-mr2-plus-aosp
* commit '
a092e9b25c45bfca849ffdd2bad3c65c8a29346e':
Import revised translations. DO NOT MERGE
Daniel Sandler [Sat, 14 Nov 2009 01:52:29 +0000 (17:52 -0800)]
am
82239b60: am
2ff01ef6: Fine-tuning the DeskClock UI.
Merge commit '
82239b60431594f820f0ce4bd339b5405c12c4c0' into eclair-mr2-plus-aosp
* commit '
82239b60431594f820f0ce4bd339b5405c12c4c0':
Fine-tuning the DeskClock UI.
Eric Fischer [Sat, 14 Nov 2009 01:48:59 +0000 (17:48 -0800)]
am
33137d79: (-s ours) Merge change Ia9f7e629 into eclair
Merge commit '
33137d791aadea46f6ed8ceae198d3f5a2e4a964' into eclair-mr2
* commit '
33137d791aadea46f6ed8ceae198d3f5a2e4a964':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:47:58 +0000 (17:47 -0800)]
am
33137d79: Merge change Ia9f7e629 into eclair
Merge commit '
33137d791aadea46f6ed8ceae198d3f5a2e4a964' into eclair-plus-aosp
* commit '
33137d791aadea46f6ed8ceae198d3f5a2e4a964':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Sat, 14 Nov 2009 01:45:25 +0000 (17:45 -0800)]
Merge change Ia9f7e629 into eclair
* changes:
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:21:12 +0000 (17:21 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Daniel Sandler [Sat, 14 Nov 2009 00:15:22 +0000 (16:15 -0800)]
am
2ff01ef6: Fine-tuning the DeskClock UI.
Merge commit '
2ff01ef636c8896455e6780fbe14cd0dca207969' into eclair-mr2
* commit '
2ff01ef636c8896455e6780fbe14cd0dca207969':
Fine-tuning the DeskClock UI.
Daniel Sandler [Sat, 14 Nov 2009 00:14:50 +0000 (16:14 -0800)]
am
2ff01ef6: Fine-tuning the DeskClock UI.
Merge commit '
2ff01ef636c8896455e6780fbe14cd0dca207969' into eclair-plus-aosp
* commit '
2ff01ef636c8896455e6780fbe14cd0dca207969':
Fine-tuning the DeskClock UI.
Daniel Sandler [Fri, 13 Nov 2009 20:02:08 +0000 (12:02 -0800)]
Fine-tuning the DeskClock UI.
Date format used is the new full_wday_month_day_no_year,
which should fix http://b/
2254472 and http://b/
2247356 .
Font sizes and colors tweaked to match latest spec.
Eric Fischer [Fri, 13 Nov 2009 19:35:19 +0000 (11:35 -0800)]
am
11c31425: (-s ours) am
4a12dab4: am
5a2aa678: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
11c3142521f70fed2d3045e1470abb2dfdf3ff6e'
* commit '
11c3142521f70fed2d3045e1470abb2dfdf3ff6e':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 19:14:11 +0000 (11:14 -0800)]
am
4a12dab4: am
5a2aa678: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
4a12dab4a00c414c7a88b7118c0e51b77130a70d' into eclair-mr2-plus-aosp
* commit '
4a12dab4a00c414c7a88b7118c0e51b77130a70d':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 18:43:21 +0000 (10:43 -0800)]
am
5a2aa678: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
5a2aa6783837954c496f49e3e08b3c57a626e326' into eclair-mr2
* commit '
5a2aa6783837954c496f49e3e08b3c57a626e326':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 18:43:07 +0000 (10:43 -0800)]
am
5a2aa678: Import revised translations. DO NOT MERGE
Merge commit '
5a2aa6783837954c496f49e3e08b3c57a626e326' into eclair-plus-aosp
* commit '
5a2aa6783837954c496f49e3e08b3c57a626e326':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 03:47:57 +0000 (19:47 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Daniel Sandler [Thu, 12 Nov 2009 21:58:26 +0000 (13:58 -0800)]
Patrick Scott [Thu, 12 Nov 2009 21:58:22 +0000 (13:58 -0800)]
am
9477dee8: am
123538f3: am
bafd4638: Merge change Ic7edd6ea into eclair
Merge commit '
9477dee8beaf282a8a2d04ba58651e3bbb0c5cff'
* commit '
9477dee8beaf282a8a2d04ba58651e3bbb0c5cff':
Cancel the snooze if the user sets an alarm for before the snooze fires.
Daniel Sandler [Thu, 12 Nov 2009 21:56:21 +0000 (13:56 -0800)]
Patrick Scott [Thu, 12 Nov 2009 21:56:18 +0000 (13:56 -0800)]
am
123538f3: am
bafd4638: Merge change Ic7edd6ea into eclair
Merge commit '
123538f398bec9e425aee6fd427aa4ad7a11fb28' into eclair-mr2-plus-aosp
* commit '
123538f398bec9e425aee6fd427aa4ad7a11fb28':
Cancel the snooze if the user sets an alarm for before the snooze fires.
Daniel Sandler [Thu, 12 Nov 2009 21:53:27 +0000 (13:53 -0800)]
Daniel Sandler [Thu, 12 Nov 2009 21:53:06 +0000 (13:53 -0800)]
Daniel Sandler [Thu, 12 Nov 2009 21:40:19 +0000 (13:40 -0800)]
Fix http://b/
2249983 .
Place the other activities in Clock in their own task
affinity and hide them from the recent apps list.
Additionally, launch other apps with the new task flag
(since we're behaving like a launcher).