OSDN Git Service
Michael Chan [Wed, 10 Feb 2010 01:39:11 +0000 (17:39 -0800)]
Merge "b/
2360864 Added reminder time of 1 minute"
Michael Chan [Wed, 10 Feb 2010 01:13:43 +0000 (17:13 -0800)]
b/
2360864 Added reminder time of 1 minute
Change-Id: I716277c389fa6ce06cb90386a35068788516f583
Eugene Koh [Tue, 9 Feb 2010 20:22:40 +0000 (12:22 -0800)]
Merge "Update mdpi resource with 2.0 style icon"
Michael Chan [Tue, 9 Feb 2010 20:05:21 +0000 (12:05 -0800)]
b/
2385751 Update string from No subject to No title
Change-Id: I7c56f5000d81aff069490edb3a54a8d40ebf0204
Erik [Mon, 8 Feb 2010 20:57:03 +0000 (12:57 -0800)]
String tweak for the My Calendars option.
Changed from 'Sync & Display Options' to 'Calendars' to provide a shorter
name that fits better in the given space and is easier for i18n.
Bai Tao [Sat, 6 Feb 2010 08:25:37 +0000 (16:25 +0800)]
Update mdpi resource with 2.0 style icon
The Android Open Source Project [Fri, 5 Feb 2010 22:25:02 +0000 (14:25 -0800)]
am
b03c3f71: am
9e8cd529: reconcile main tree with open-source eclair
Merge commit '
b03c3f71949ec42464b80569ec04059510bf0da0'
* commit '
b03c3f71949ec42464b80569ec04059510bf0da0':
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:49:29 +0000 (08:49 -0800)]
am
9e8cd529: reconcile main tree with open-source eclair
Merge commit '
9e8cd529c75374d55eae51af564dc28c82c81f2b' into eclair-plus-aosp
* commit '
9e8cd529c75374d55eae51af564dc28c82c81f2b':
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:09:39 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
Michael Chan [Thu, 4 Feb 2010 22:10:42 +0000 (14:10 -0800)]
Merge "Save the last calendar used for event creation as the default for creating the next event."
Erik Pasternak [Thu, 4 Feb 2010 22:04:48 +0000 (14:04 -0800)]
Merge "b/
2418284 Added mdpi button images for My Calendars button."
Erik [Thu, 4 Feb 2010 21:36:19 +0000 (13:36 -0800)]
b/
2418284 Added mdpi button images for My Calendars button.
Should fix the Sync and Display Options crash on medium resolution screens.
Ken Shirriff [Thu, 4 Feb 2010 17:43:07 +0000 (09:43 -0800)]
Fix DismissAllAlarmsService.
Updates need to be done on calendar_alerts, not
calendar_alerts_by_instance. The latter is intended to group results
when querying.
bug
2417941
Michael Chan [Thu, 4 Feb 2010 01:44:37 +0000 (17:44 -0800)]
Save the last calendar used for event creation as the default for creating the next event.
This was done to remove the google dependency.
Change-Id: I14051f1098d3e78ffa76ef2890b9595809c5d186
Michael Chan [Wed, 3 Feb 2010 20:56:56 +0000 (12:56 -0800)]
Merge "First step in unbundling Calendar"
Michael Chan [Thu, 28 Jan 2010 02:03:25 +0000 (18:03 -0800)]
First step in unbundling Calendar
Change-Id: I12cf0e4141c069514dec78344592532848983abc
Michael Chan [Wed, 3 Feb 2010 03:17:31 +0000 (19:17 -0800)]
Merge "Temp Debug code to figure ANR problems"
Erik [Wed, 3 Feb 2010 02:28:08 +0000 (18:28 -0800)]
Fix build break
Michael Chan [Wed, 3 Feb 2010 02:14:38 +0000 (18:14 -0800)]
Temp Debug code to figure ANR problems
Change-Id: I716d731e248b57b0580da7a08a927a8a5942285d
Erik Pasternak [Wed, 3 Feb 2010 01:54:02 +0000 (17:54 -0800)]
Merge "b/
2123477 Redesign of My Calendars UI."
Erik [Tue, 26 Jan 2010 23:42:15 +0000 (15:42 -0800)]
b/
2123477 Redesign of My Calendars UI.
Numerous bugs regarding My Calendars, b/
2123477 b/
2115475 b/
2039467 b/
1345982
Complete redesign of UI to better support multiple accounts as well as toggling
between synced and visible, just synced, and not synced.
Erik Pasternak [Wed, 3 Feb 2010 01:01:51 +0000 (17:01 -0800)]
Merge "b/
2378646 Temporary workaround for Marc to use Exchange Calendar."
Erik [Fri, 22 Jan 2010 21:34:33 +0000 (13:34 -0800)]
b/
2378646 Temporary workaround for Marc to use Exchange Calendar.
Changes the check for accounts when starting Calendar to see if any accounts are adding
to the Calendars table instead of looking for a Google account. Should allow Exchange
to work without a google account. This version still bounces users to the Google
account creation wizard if no calendar accounts exist.
Erik [Thu, 28 Jan 2010 02:39:10 +0000 (18:39 -0800)]
Added an indicator for the current time.
Added code to display a marker at the far left at the current time as well
as a line across the current day at the current time. The marker and line
are only drawn when the current day and current time are visible.
The Android Open Source Project [Fri, 29 Jan 2010 22:09:21 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot
Erik [Wed, 27 Jan 2010 17:57:58 +0000 (09:57 -0800)]
b/
1903713 Made sync not update the event quick view.
Added in an ID check so that sync will only cause the quick view to
open again if it changes the selected event to a different event.
This only prevents sync from popping up a new quick view. It will
still show up in all other cases.
Takaoka G. Tadashi [Wed, 27 Jan 2010 01:18:38 +0000 (10:18 +0900)]
Fix trivial formatting error
Tadashi Takaoka [Wed, 27 Jan 2010 01:14:55 +0000 (17:14 -0800)]
Merge "Add color setting for Saturday and Sunday in month view"
Michael Chan [Mon, 25 Jan 2010 16:58:27 +0000 (08:58 -0800)]
am
a8e963c6: am
b67e98de: b/
2377547 Fixed a test hard codes the "current year". So come happy new year and the test fails.
Merge commit '
a8e963c6e4678519d3788db34cf639c5ed24060a'
* commit '
a8e963c6e4678519d3788db34cf639c5ed24060a':
b/
2377547 Fixed a test hard codes the "current year". So come happy new year and the test fails.
Takaoka G. Tadashi [Fri, 22 Jan 2010 10:16:43 +0000 (19:16 +0900)]
Add color setting for Saturday and Sunday in month view
This also get the colors (in ja_JP locale) slightly lighter than before.
Bug:
1614177
Doug Zongker [Thu, 21 Jan 2010 22:36:24 +0000 (14:36 -0800)]
relocate GoogleLoginService
Change-Id: I05833c6bfba98ee8d5f32169ec94a4ca48457b4d
Michael Chan [Wed, 20 Jan 2010 23:27:07 +0000 (15:27 -0800)]
am
b67e98de: b/
2377547 Fixed a test hard codes the "current year". So come happy new year and the test fails.
Merge commit '
b67e98de50a61dcf9bec814cabeb97ff12057d13' into eclair-plus-aosp
* commit '
b67e98de50a61dcf9bec814cabeb97ff12057d13':
b/
2377547 Fixed a test hard codes the "current year". So come happy new year and the test fails.
Michael Chan [Wed, 20 Jan 2010 22:39:40 +0000 (14:39 -0800)]
b/
2377547 Fixed a test hard codes the "current year". So come happy new year and the test fails.
Change-Id: I4f8731cc8c23965e87a01fe1132b0478ee5713ad
satok [Fri, 15 Jan 2010 23:11:21 +0000 (08:11 +0900)]
Add color setting for Saturday and Sunday
BUG:
1614177
The Android Open Source Project [Tue, 12 Jan 2010 23:19:09 +0000 (15:19 -0800)]
android-2.1_r1 snapshot
Romain Guy [Fri, 8 Jan 2010 23:06:46 +0000 (15:06 -0800)]
Deprecate fill_parent and introduce match_parent.
Bug: #
2361749.
Erik Pasternak [Fri, 8 Jan 2010 18:45:33 +0000 (10:45 -0800)]
Merge "b/
2293263 Finished removing busybits references."
Eric Fischer [Fri, 8 Jan 2010 18:01:52 +0000 (10:01 -0800)]
Merge "Update with latest translations."
Erik [Fri, 8 Jan 2010 00:48:36 +0000 (16:48 -0800)]
b/
2293263 Finished removing busybits references.
Eric Fischer [Thu, 7 Jan 2010 23:56:44 +0000 (15:56 -0800)]
Update with latest translations.
Erik [Thu, 7 Jan 2010 18:36:43 +0000 (10:36 -0800)]
b/
2358627 and b/
2293263 Fixed multi-day events and oob crash.
Added better query processing to handle multi-day events and prevent index
out of bounds crashes.
Jean-Baptiste Queru [Wed, 6 Jan 2010 00:27:21 +0000 (16:27 -0800)]
Do not use a user tag on apps, as it is ignored.
The build system does not honor user tags on apps,
and setting it is misleading.
This removes the confusion by making the makefiles
behave like they read.
Change-Id: Ib451a7256deadcb4fc2847b7c79450aacca190ae
Erik [Wed, 23 Dec 2009 23:30:37 +0000 (15:30 -0800)]
b/
2293263 Replaced busybits functionality with eventday functionality.
Removed references to busybits functionality and added in functionality to instead only check for
the existence of an event on a given day for the month view. Also added a new graphic for marking
which days have events and darkened the backgrounds for the current day.
Jeff Sharkey [Wed, 16 Dec 2009 23:39:18 +0000 (15:39 -0800)]
Use public "attr" references for QuickContacts.
Fixes http://b/
2329628
Michael Chan [Wed, 16 Dec 2009 16:59:46 +0000 (08:59 -0800)]
am
c6c924fb: am
9830a458: b/
2329004 Show attendee\'s IM status when QuickContactBadge is invoked.
Merge commit '
c6c924fb9979b985039329e3ad2bf44f7cf4ceee'
* commit '
c6c924fb9979b985039329e3ad2bf44f7cf4ceee':
b/
2329004 Show attendee's IM status when QuickContactBadge is invoked.
Michael Chan [Wed, 16 Dec 2009 16:59:17 +0000 (08:59 -0800)]
am
6f32f8b3: am
e2ae1ef8: b/
2224837 Changed the plumbing of how alerts/notifications work.
Merge commit '
6f32f8b359288c6e52029d73e030be2956ebd98a'
* commit '
6f32f8b359288c6e52029d73e030be2956ebd98a':
b/
2224837 Changed the plumbing of how alerts/notifications work.
Erik [Wed, 16 Dec 2009 01:19:48 +0000 (17:19 -0800)]
b/
2202315 Inserted colons after Calendar, Organizer, and time zone labels.
Michael Chan [Wed, 16 Dec 2009 00:27:55 +0000 (16:27 -0800)]
am
9830a458: b/
2329004 Show attendee\'s IM status when QuickContactBadge is invoked.
Merge commit '
9830a45816b20f4a7219d0f6fef664f48e7a472a' into eclair-mr2-plus-aosp
* commit '
9830a45816b20f4a7219d0f6fef664f48e7a472a':
b/
2329004 Show attendee's IM status when QuickContactBadge is invoked.
Michael Chan [Wed, 16 Dec 2009 00:18:24 +0000 (16:18 -0800)]
b/
2329004 Show attendee's IM status when QuickContactBadge is invoked.
Change-Id: I40bb28b386d696042c5f99690b866f45fafc7e17
Michael Chan [Tue, 15 Dec 2009 23:27:38 +0000 (15:27 -0800)]
am
e2ae1ef8: b/
2224837 Changed the plumbing of how alerts/notifications work.
Merge commit '
e2ae1ef8decfddcc4e5802483e92cab93c6fc67c' into eclair-mr2-plus-aosp
* commit '
e2ae1ef8decfddcc4e5802483e92cab93c6fc67c':
b/
2224837 Changed the plumbing of how alerts/notifications work.
Android Git Automerger [Tue, 15 Dec 2009 08:45:05 +0000 (00:45 -0800)]
Merge commit 'goog/eclair-plus-aosp'
Michael Chan [Thu, 19 Nov 2009 02:37:09 +0000 (18:37 -0800)]
b/
2224837 Changed the plumbing of how alerts/notifications work.
Cut down on the number db queries when process alerts
Fixed a cursor leak
Flash the event name and location in the notification bar
b/
2205255 Show the latest event in the notification. Prioritize based on your acceptance response.
b/
1544909 Flash green LED for when there's a calendar notifications.
b/
2224837 Cleanup alert/notification plumbing in Calendar
b/
1735201 Calendar notifications are not updated when locale is changed
Change-Id: I86b6904607b0236fb04719f5782f43674ac6d2bc
Paul Westbrook [Mon, 14 Dec 2009 19:50:05 +0000 (11:50 -0800)]
am
2bd33ae2: am
941c3a22: Changed class paths for classes moved in unbundling effort
Merge commit '
2bd33ae26e7cb30fc927a0b68faa91126e84360a'
* commit '
2bd33ae26e7cb30fc927a0b68faa91126e84360a':
Changed class paths for classes moved in unbundling effort
Paul Westbrook [Mon, 14 Dec 2009 18:40:48 +0000 (10:40 -0800)]
am
941c3a22: Changed class paths for classes moved in unbundling effort
Merge commit '
941c3a226d77a36ea43b8946d3f6b667449d13a8' into eclair-mr2-plus-aosp
* commit '
941c3a226d77a36ea43b8946d3f6b667449d13a8':
Changed class paths for classes moved in unbundling effort
Paul Westbrook [Fri, 11 Dec 2009 23:37:52 +0000 (15:37 -0800)]
Changed class paths for classes moved in unbundling effort
Eric Fischer [Fri, 11 Dec 2009 07:40:53 +0000 (23:40 -0800)]
am
f631ea97: (-s ours) am
fb2b0ca2: am
9616fc15: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
f631ea9727d8738bea2ef98543e9ac162dc0426c'
* commit '
f631ea9727d8738bea2ef98543e9ac162dc0426c':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 11 Dec 2009 01:53:31 +0000 (17:53 -0800)]
am
fb2b0ca2: am
9616fc15: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
fb2b0ca2dc2f8b2a6a14d2204e8d5e408432a5f3' into eclair-mr2-plus-aosp
* commit '
fb2b0ca2dc2f8b2a6a14d2204e8d5e408432a5f3':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 11 Dec 2009 01:43:06 +0000 (17:43 -0800)]
am
9616fc15: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
9616fc15195c4670c8b513bc6b8cd1f08469d086' into eclair-mr2
* commit '
9616fc15195c4670c8b513bc6b8cd1f08469d086':
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Thu, 10 Dec 2009 19:17:10 +0000 (11:17 -0800)]
manual merge
Eric Fischer [Thu, 10 Dec 2009 02:07:06 +0000 (18:07 -0800)]
am
9616fc15: Import revised translations. DO NOT MERGE
Merge commit '
9616fc15195c4670c8b513bc6b8cd1f08469d086' into eclair-plus-aosp
* commit '
9616fc15195c4670c8b513bc6b8cd1f08469d086':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Dec 2009 01:24:56 +0000 (17:24 -0800)]
Import revised translations. DO NOT MERGE
Paul Westbrook [Wed, 9 Dec 2009 23:50:43 +0000 (15:50 -0800)]
am
93058fbd: Removed usage of Gmail.java from the Calendar
Merge commit '
93058fbdb0f15f089554c567be970b3af2288e98' into eclair-mr2-plus-aosp
* commit '
93058fbdb0f15f089554c567be970b3af2288e98':
Removed usage of Gmail.java from the Calendar
Paul Westbrook [Tue, 8 Dec 2009 20:01:42 +0000 (12:01 -0800)]
Removed usage of Gmail.java from the Calendar
This is a temporary fix, until the Calendar has been switched to
use the AccountManagerService to look for an account that hase
the calendar service bit
http://b/issue?id=
2313182
Eric Fischer [Thu, 3 Dec 2009 04:40:44 +0000 (20:40 -0800)]
am
f5dd2eea: (-s ours) am
f5ab8ba0: am
3531081b: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
f5dd2eeae3f46ccb37cea0169747a14dd218b7de'
* commit '
f5dd2eeae3f46ccb37cea0169747a14dd218b7de':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 23:21:08 +0000 (15:21 -0800)]
am
f5ab8ba0: am
3531081b: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
f5ab8ba0b04eb4f1777f92991905b1820c84b6e5' into eclair-mr2-plus-aosp
* commit '
f5ab8ba0b04eb4f1777f92991905b1820c84b6e5':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 23:11:46 +0000 (15:11 -0800)]
am
3531081b: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
3531081b3d74333cae485ec5be2b58375e950a84' into eclair-mr2
* commit '
3531081b3d74333cae485ec5be2b58375e950a84':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 23:09:37 +0000 (15:09 -0800)]
am
3531081b: Import revised translations. DO NOT MERGE
Merge commit '
3531081b3d74333cae485ec5be2b58375e950a84' into eclair-plus-aosp
* commit '
3531081b3d74333cae485ec5be2b58375e950a84':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 22:55:47 +0000 (14:55 -0800)]
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 01:39:34 +0000 (17:39 -0800)]
am
fcc08652: (-s ours) am
042de1dd: am
8b091b9c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
fcc086520f3c5e61e6f8657d247d5138eceb2662'
* commit '
fcc086520f3c5e61e6f8657d247d5138eceb2662':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 01:29:53 +0000 (17:29 -0800)]
am
042de1dd: am
8b091b9c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
042de1ddbe398dd17d0cabb70e07c76c7e83bbe6' into eclair-mr2-plus-aosp
* commit '
042de1ddbe398dd17d0cabb70e07c76c7e83bbe6':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 01:10:27 +0000 (17:10 -0800)]
am
8b091b9c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
8b091b9c7e336695de5acf08a25eb5cb0fe081b7' into eclair-mr2
* commit '
8b091b9c7e336695de5acf08a25eb5cb0fe081b7':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 30 Nov 2009 20:01:05 +0000 (12:01 -0800)]
am
8b091b9c: Import revised translations. DO NOT MERGE
Merge commit '
8b091b9c7e336695de5acf08a25eb5cb0fe081b7' into eclair-plus-aosp
* commit '
8b091b9c7e336695de5acf08a25eb5cb0fe081b7':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 30 Nov 2009 19:35:09 +0000 (11:35 -0800)]
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Sun, 15 Nov 2009 23:09:38 +0000 (15:09 -0800)]
am
032e9a72: merge from open-source master
Merge commit '
032e9a7297e0c3d30e498517a4476b74c1782cf5'
* commit '
032e9a7297e0c3d30e498517a4476b74c1782cf5':
revive a hack that creates a local calendar if the google account authenticator is not present
eclair snapshot
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:55:23 +0000 (14:55 -0800)]
merge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:03:27 +0000 (14:03 -0800)]
merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:03:27 +0000 (14:03 -0800)]
merge from open-source master
Merge commit 'goog/stage-korg-master^' into HEAD
Fred Quintana [Thu, 12 Nov 2009 20:29:47 +0000 (12:29 -0800)]
revive a hack that creates a local calendar if the google account authenticator is not present
Jean-Baptiste Queru [Sun, 15 Nov 2009 20:06:44 +0000 (12:06 -0800)]
merge from eclair
Eric Fischer [Sat, 14 Nov 2009 01:58:20 +0000 (17:58 -0800)]
am
e6898c8a: (-s ours) am
ef98d583: am
196895b9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
e6898c8a3d598f1ff33af64e071590699ebaa0a0'
* commit '
e6898c8a3d598f1ff33af64e071590699ebaa0a0':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:52:20 +0000 (17:52 -0800)]
am
ef98d583: am
196895b9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
ef98d583e00474a07b2dd8ccdca420ade60d9fe2' into eclair-mr2-plus-aosp
* commit '
ef98d583e00474a07b2dd8ccdca420ade60d9fe2':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:48:50 +0000 (17:48 -0800)]
am
196895b9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
196895b9ac299206e5a5d3eb92e955a08cca379d' into eclair-mr2
* commit '
196895b9ac299206e5a5d3eb92e955a08cca379d':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:47:51 +0000 (17:47 -0800)]
am
196895b9: Import revised translations. DO NOT MERGE
Merge commit '
196895b9ac299206e5a5d3eb92e955a08cca379d' into eclair-plus-aosp
* commit '
196895b9ac299206e5a5d3eb92e955a08cca379d':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:15:28 +0000 (17:15 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:46:08 +0000 (18:46 -0800)]
eclair snapshot
Michael Chan [Wed, 11 Nov 2009 22:34:22 +0000 (14:34 -0800)]
am
5a7eab20: am
e15d871c: b/
2238048 Don\'t capitalize every word in the event title
Merge commit '
5a7eab20b748f76af8201f134ce87c646f6484f3'
* commit '
5a7eab20b748f76af8201f134ce87c646f6484f3':
b/
2238048 Don't capitalize every word in the event title
Michael Chan [Wed, 11 Nov 2009 22:31:53 +0000 (14:31 -0800)]
am
e15d871c: b/
2238048 Don\'t capitalize every word in the event title
Merge commit '
e15d871c1b64e96bd65bfcb01ca57b2e39983fb7' into eclair-mr2-plus-aosp
* commit '
e15d871c1b64e96bd65bfcb01ca57b2e39983fb7':
b/
2238048 Don't capitalize every word in the event title
Michael Chan [Tue, 10 Nov 2009 23:39:12 +0000 (15:39 -0800)]
b/
2238048 Don't capitalize every word in the event title
Change-Id: Ia982b50a44d10de729589147bad1d3cf260c9ee9
Eric Fischer [Sat, 7 Nov 2009 00:25:51 +0000 (16:25 -0800)]
am
695710f9: (-s ours) am
9d734422: Import revised translations. DO NOT MERGE
Merge commit '
695710f9f6e398591c44caa92fe44962dc9df1d6'
* commit '
695710f9f6e398591c44caa92fe44962dc9df1d6':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 7 Nov 2009 00:10:38 +0000 (16:10 -0800)]
am
9d734422: Import revised translations. DO NOT MERGE
Merge commit '
9d734422b101454007e422d2aaf8521d641511e6' into eclair-mr2-plus-aosp
* commit '
9d734422b101454007e422d2aaf8521d641511e6':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 6 Nov 2009 23:26:29 +0000 (15:26 -0800)]
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Mon, 2 Nov 2009 22:16:21 +0000 (14:16 -0800)]
am
d0e6c63d: merge from open-source master
Merge commit '
d0e6c63d1fed16f062cc39fd9b200d06287507de'
* commit '
d0e6c63d1fed16f062cc39fd9b200d06287507de':
Create a default calendar if there's none from GLS.
Jean-Baptiste Queru [Mon, 2 Nov 2009 22:09:31 +0000 (14:09 -0800)]
merge from open-source master
Jean-Baptiste Queru [Mon, 2 Nov 2009 22:00:59 +0000 (14:00 -0800)]
merge from open-source master
Michael Chan [Fri, 30 Oct 2009 03:20:23 +0000 (20:20 -0700)]
am
8d98857d: am
ea9538d8: am
0e7235b0: b/
2194249 Prevent Calendar from playing multiple notification tones around the same time. This is a safe but temp fix for overlapping ringtones playing at the same time.
Merge commit '
8d98857db975b9dc9e505983deb1b6802924e121'
* commit '
8d98857db975b9dc9e505983deb1b6802924e121':
b/
2194249 Prevent Calendar from playing multiple notification tones around the same time.
Eric Fischer [Fri, 30 Oct 2009 03:20:18 +0000 (20:20 -0700)]
am
5c579f30: (-s ours) am
fa31dd93: am
84f61027: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
5c579f30195de370150b68282c61c0e207f98568'
* commit '
5c579f30195de370150b68282c61c0e207f98568':
Import revised translations. DO NOT MERGE
Michael Chan [Fri, 30 Oct 2009 03:00:12 +0000 (20:00 -0700)]
am
ea9538d8: am
0e7235b0: b/
2194249 Prevent Calendar from playing multiple notification tones around the same time. This is a safe but temp fix for overlapping ringtones playing at the same time.
Merge commit '
ea9538d8cf21aa542235854deb8caadeac746f44' into eclair-mr2-plus-aosp
* commit '
ea9538d8cf21aa542235854deb8caadeac746f44':
b/
2194249 Prevent Calendar from playing multiple notification tones around the same time.
Eric Fischer [Fri, 30 Oct 2009 03:00:07 +0000 (20:00 -0700)]
am
fa31dd93: am
84f61027: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
fa31dd93ca69f1ba058c82f34fe56f60badf50c3' into eclair-mr2-plus-aosp
* commit '
fa31dd93ca69f1ba058c82f34fe56f60badf50c3':
Import revised translations. DO NOT MERGE
Michael Chan [Fri, 30 Oct 2009 02:28:06 +0000 (19:28 -0700)]
am
0e7235b0: b/
2194249 Prevent Calendar from playing multiple notification tones around the same time. This is a safe but temp fix for overlapping ringtones playing at the same time.
Merge commit '
0e7235b00fdf47c773592a324c4a62ef95d1dcf4' into eclair-mr2
* commit '
0e7235b00fdf47c773592a324c4a62ef95d1dcf4':
b/
2194249 Prevent Calendar from playing multiple notification tones around the same time.
Eric Fischer [Fri, 30 Oct 2009 02:23:58 +0000 (19:23 -0700)]
am
84f61027: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
84f61027e16cf75567bd9fd3fa591931158981bf' into eclair-mr2
* commit '
84f61027e16cf75567bd9fd3fa591931158981bf':
Import revised translations. DO NOT MERGE
OSDN Git Service
