OSDN Git Service
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 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
Michael Chan [Thu, 29 Oct 2009 18:04:54 +0000 (11:04 -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-plus-aosp
* commit '
0e7235b00fdf47c773592a324c4a62ef95d1dcf4':
b/
2194249 Prevent Calendar from playing multiple notification tones around the same time.
Michael Chan [Thu, 29 Oct 2009 07:17:21 +0000 (00:17 -0700)]
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.
Change-Id: I8d8bc976837c0ef036626fd991bfcd2c91772c64
Eric Fischer [Thu, 29 Oct 2009 06:34:08 +0000 (23:34 -0700)]
am
84f61027: Import revised translations. DO NOT MERGE
Merge commit '
84f61027e16cf75567bd9fd3fa591931158981bf' into eclair-plus-aosp
* commit '
84f61027e16cf75567bd9fd3fa591931158981bf':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 29 Oct 2009 04:17:50 +0000 (21:17 -0700)]
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Mon, 26 Oct 2009 18:10:55 +0000 (11:10 -0700)]
Create a default calendar if there's none from GLS.
Eric Fischer [Thu, 22 Oct 2009 16:51:56 +0000 (09:51 -0700)]
am
f92b0264: (-s ours) am
debb3028: am
7204b269: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
f92b026431050d499b139e49bee33251cff642a8'
* commit '
f92b026431050d499b139e49bee33251cff642a8':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 16:35:37 +0000 (09:35 -0700)]
am
debb3028: am
7204b269: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
debb302865348492aeb20e9b9b309ba0e24a559a' into eclair-mr2-plus-aosp
* commit '
debb302865348492aeb20e9b9b309ba0e24a559a':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 13:46:37 +0000 (06:46 -0700)]
am
7204b269: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
7204b26927cc95945521607e4e771c6164473a01' into eclair-mr2
* commit '
7204b26927cc95945521607e4e771c6164473a01':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 19:15:37 +0000 (12:15 -0700)]
am
7204b269: Import revised translations. DO NOT MERGE
Merge commit '
7204b26927cc95945521607e4e771c6164473a01' into eclair-plus-aosp
* commit '
7204b26927cc95945521607e4e771c6164473a01':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 17:43:08 +0000 (10:43 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Eric Fischer [Wed, 14 Oct 2009 00:18:12 +0000 (17:18 -0700)]
am
9b2db215: (-s ours) am
72c62c39: Import revised translations. DO NOT MERGE
Merge commit '
9b2db21536e177ebb2f6b17985f1c1e6f54cd8dd'
* commit '
9b2db21536e177ebb2f6b17985f1c1e6f54cd8dd':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 14 Oct 2009 00:09:07 +0000 (17:09 -0700)]
am
72c62c39: Import revised translations. DO NOT MERGE
Merge commit '
72c62c39fe83a2e6a72c95c14c4bb3bd0bef8281' into eclair-mr2-plus-aosp
* commit '
72c62c39fe83a2e6a72c95c14c4bb3bd0bef8281':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 13 Oct 2009 23:31:48 +0000 (16:31 -0700)]
Reimport translations.
Change-Id: Ic9114c28b0295db373bcc838ea7fa3f394400f2b
Eric Fischer [Tue, 13 Oct 2009 23:05:03 +0000 (16:05 -0700)]
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 13 Oct 2009 19:07:08 +0000 (12:07 -0700)]
am
1606dcc9: (-s ours) am
59b2307e: am
ea631334: (-s ours) am
92a90a31: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
1606dcc982d51c4966340dc7d888b976c9791266'
* commit '
1606dcc982d51c4966340dc7d888b976c9791266':
Dianne Hackborn [Tue, 13 Oct 2009 19:07:05 +0000 (12:07 -0700)]
am
ed5b0a4f: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Calendar into eclair-mr2-plus-aosp
Merge commit '
ed5b0a4fbe3ebbdc92342bde8145b28cf3811642'
* commit '
ed5b0a4fbe3ebbdc92342bde8145b28cf3811642':
Import revised translations. DO NOT MERGE
Dianne Hackborn [Mon, 12 Oct 2009 19:41:19 +0000 (12:41 -0700)]
Michael Chan [Mon, 12 Oct 2009 19:41:16 +0000 (12:41 -0700)]
am
726f3310: am
31f472ca: am
9b168fae: b/
2167301 Guests were dropped when creating an exception to a recurring event.
Merge commit '
726f3310a62e4ca0da095a555d35ceb308c0a344'
* commit '
726f3310a62e4ca0da095a555d35ceb308c0a344':
Eric Laurent [Mon, 12 Oct 2009 19:41:13 +0000 (12:41 -0700)]
am
2a97508f: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Calendar into eclair-mr2-plus-aosp
Merge commit '
2a97508f750c669024b2f53dfb296099b416b0ab'
* commit '
2a97508f750c669024b2f53dfb296099b416b0ab':
Fix issue #
2171460: Turn off background blurring of power dialog
b/
2167301 Guests were dropped when creating an exception to a recurring event.
Fred Quintana [Mon, 12 Oct 2009 18:29:19 +0000 (11:29 -0700)]
am
6e75d101: am
57d431e9: am
1450d5ca: account manager api review changes
Merge commit '
6e75d101fdd8d7980c53762c141ebbbe4053b9fc'
* commit '
6e75d101fdd8d7980c53762c141ebbbe4053b9fc':
account manager api review changes
Fred Quintana [Mon, 12 Oct 2009 18:29:16 +0000 (11:29 -0700)]
am
9ec73bdc: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Calendar into eclair-mr2-plus-aosp
Merge commit '
9ec73bdc47cc330e4fc88f40cca60277df239331'
* commit '
9ec73bdc47cc330e4fc88f40cca60277df239331':
Debajit Ghosh [Mon, 12 Oct 2009 18:25:37 +0000 (11:25 -0700)]
am
330e2156: am
8dcd2932: set the attendee email when changing your own attendance in the attendees table, so some calendar provider code can update the self attendance in the Event.
Merge commit '
330e2156ac024dd8af3ed328f43ef6de636d11c8'
* commit '
330e2156ac024dd8af3ed328f43ef6de636d11c8':
set the attendee email when changing your own attendance in the attendees table, so some calendar provider code can update the self attendance in the Event.
Eric Fischer [Mon, 12 Oct 2009 18:25:34 +0000 (11:25 -0700)]
am
9c6f59cf: (-s ours) am
003962ad: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
9c6f59cf61dd93ea973b7101ea767c3ab0375064'
* commit '
9c6f59cf61dd93ea973b7101ea767c3ab0375064':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 9 Oct 2009 00:54:09 +0000 (17:54 -0700)]
am
59b2307e: am
ea631334: (-s ours) am
92a90a31: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
59b2307edb692344d8a05002172858d15638e8c3' into eclair-mr2-plus-aosp
* commit '
59b2307edb692344d8a05002172858d15638e8c3':
Dianne Hackborn [Fri, 9 Oct 2009 00:54:09 +0000 (17:54 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Calendar into eclair-mr2-plus-aosp
Eric Fischer [Fri, 9 Oct 2009 00:35:25 +0000 (17:35 -0700)]
am
ea631334: (-s ours) am
92a90a31: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
ea63133466ed5deff1151e2878bfb8e7c908c431' into eclair-mr2
* commit '
ea63133466ed5deff1151e2878bfb8e7c908c431':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Oct 2009 22:15:55 +0000 (15:15 -0700)]
am
ea631334: am
92a90a31: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
ea63133466ed5deff1151e2878bfb8e7c908c431' into eclair-plus-aosp
* commit '
ea63133466ed5deff1151e2878bfb8e7c908c431':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Oct 2009 22:02:35 +0000 (15:02 -0700)]
am
92a90a31: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
92a90a31c8842b89793771784719c52950c9237e' into eclair
* commit '
92a90a31c8842b89793771784719c52950c9237e':
Import revised translations. DO NOT MERGE
Dianne Hackborn [Thu, 8 Oct 2009 00:44:57 +0000 (17:44 -0700)]
am
5da28cdc: am
9d1c2039: Fix issue #
2171460: Turn off background blurring of power dialog
Merge commit '
5da28cdcc08500eb9574d80c9973715e40b16e76' into eclair-mr2-plus-aosp
* commit '
5da28cdcc08500eb9574d80c9973715e40b16e76':
Michael Chan [Thu, 8 Oct 2009 00:44:53 +0000 (17:44 -0700)]
am
31f472ca: am
9b168fae: b/
2167301 Guests were dropped when creating an exception to a recurring event.
Merge commit '
31f472caed0618ab2d15aa7b493fada2c0abf846' into eclair-mr2-plus-aosp
* commit '
31f472caed0618ab2d15aa7b493fada2c0abf846':
Eric Laurent [Thu, 8 Oct 2009 00:44:53 +0000 (17:44 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Calendar into eclair-mr2-plus-aosp
Dianne Hackborn [Thu, 8 Oct 2009 00:41:31 +0000 (17:41 -0700)]
am
9d1c2039: Fix issue #
2171460: Turn off background blurring of power dialog
Merge commit '
9d1c203947bbbf2d36dd6ffe73e6ee497f7a252d' into eclair-plus-aosp
* commit '
9d1c203947bbbf2d36dd6ffe73e6ee497f7a252d':
Fix issue #
2171460: Turn off background blurring of power dialog
Michael Chan [Thu, 8 Oct 2009 00:41:28 +0000 (17:41 -0700)]
am
9b168fae: b/
2167301 Guests were dropped when creating an exception to a recurring event.
Merge commit '
9b168fae95ff394c3116bfdf61af3ccb2c4c3e34' into eclair-plus-aosp
* commit '
9b168fae95ff394c3116bfdf61af3ccb2c4c3e34':
b/
2167301 Guests were dropped when creating an exception to a recurring event.
Dianne Hackborn [Thu, 8 Oct 2009 00:39:32 +0000 (17:39 -0700)]
am
9d1c2039: Fix issue #
2171460: Turn off background blurring of power dialog
Merge commit '
9d1c203947bbbf2d36dd6ffe73e6ee497f7a252d' into eclair-mr2
* commit '
9d1c203947bbbf2d36dd6ffe73e6ee497f7a252d':
Fix issue #
2171460: Turn off background blurring of power dialog
Michael Chan [Thu, 8 Oct 2009 00:39:29 +0000 (17:39 -0700)]
am
9b168fae: b/
2167301 Guests were dropped when creating an exception to a recurring event.
Merge commit '
9b168fae95ff394c3116bfdf61af3ccb2c4c3e34' into eclair-mr2
* commit '
9b168fae95ff394c3116bfdf61af3ccb2c4c3e34':
b/
2167301 Guests were dropped when creating an exception to a recurring event.
Dianne Hackborn [Wed, 7 Oct 2009 23:14:29 +0000 (16:14 -0700)]
Fix issue #
2171460: Turn off background blurring of power dialog
The calendar alert dialog was also using background dimming, but
this is a complete waste since it is full screen.
Change-Id: I59efb00b23f184251e706212bc94f75a04438d6e
Fred Quintana [Wed, 7 Oct 2009 18:46:32 +0000 (11:46 -0700)]
am
1450d5ca: account manager api review changes
Merge commit '
1450d5cae486ef4d3f5bb90c5b7fce6318bbd6cc' into eclair-plus-aosp
* commit '
1450d5cae486ef4d3f5bb90c5b7fce6318bbd6cc':
account manager api review changes
Debajit Ghosh [Wed, 7 Oct 2009 18:40:10 +0000 (11:40 -0700)]
am
8dcd2932: set the attendee email when changing your own attendance in the attendees table, so some calendar provider code can update the self attendance in the Event.
Merge commit '
8dcd29326bd6e6be91e22b88c422a4d7fc24dd3b' into eclair-plus-aosp
* commit '
8dcd29326bd6e6be91e22b88c422a4d7fc24dd3b':
set the attendee email when changing your own attendance in the attendees table, so some calendar provider code can update the self attendance in the Event.
Eric Fischer [Wed, 7 Oct 2009 18:36:31 +0000 (11:36 -0700)]
am
003962ad: Import revised translations. DO NOT MERGE
Merge commit '
003962ad0c6aa4105cb1baef5eb69b70b7a0cbb4' into eclair-plus-aosp
* commit '
003962ad0c6aa4105cb1baef5eb69b70b7a0cbb4':
Import revised translations. DO NOT MERGE
Michael Chan [Mon, 5 Oct 2009 23:35:10 +0000 (16:35 -0700)]
b/
2167301 Guests were dropped when creating an exception to a recurring event.
Change-Id: I7edb7db58eedc48c953d69cf3f2693e1c4d4a452
Fred Quintana [Mon, 5 Oct 2009 18:40:59 +0000 (11:40 -0700)]
am
57d431e9: am
1450d5ca: account manager api review changes
Merge commit '
57d431e928fbf9419fc7b0d87c34aa8472ae0d11' into eclair-mr2-plus-aosp
* commit '
57d431e928fbf9419fc7b0d87c34aa8472ae0d11':
account manager api review changes
Fred Quintana [Mon, 5 Oct 2009 18:40:59 +0000 (11:40 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Calendar into eclair-mr2-plus-aosp
Fred Quintana [Mon, 5 Oct 2009 18:34:51 +0000 (11:34 -0700)]
am
1450d5ca: account manager api review changes
Merge commit '
1450d5cae486ef4d3f5bb90c5b7fce6318bbd6cc' into eclair-mr2
* commit '
1450d5cae486ef4d3f5bb90c5b7fce6318bbd6cc':
account manager api review changes
Fred Quintana [Sat, 3 Oct 2009 00:19:17 +0000 (17:19 -0700)]
account manager api review changes
Debajit Ghosh [Sun, 4 Oct 2009 22:19:19 +0000 (15:19 -0700)]
am
8dcd2932: set the attendee email when changing your own attendance in the attendees table, so some calendar provider code can update the self attendance in the Event.
Merge commit '
8dcd29326bd6e6be91e22b88c422a4d7fc24dd3b' into eclair-mr2
* commit '
8dcd29326bd6e6be91e22b88c422a4d7fc24dd3b':
set the attendee email when changing your own attendance in the attendees table, so some calendar provider code can update the self attendance in the Event.
Eric Fischer [Sun, 4 Oct 2009 22:16:16 +0000 (15:16 -0700)]
am
003962ad: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
003962ad0c6aa4105cb1baef5eb69b70b7a0cbb4' into eclair-mr2
* commit '
003962ad0c6aa4105cb1baef5eb69b70b7a0cbb4':
Import revised translations. DO NOT MERGE
Debajit Ghosh [Fri, 2 Oct 2009 19:37:51 +0000 (12:37 -0700)]
set the attendee email when changing your own attendance in the attendees table, so some calendar provider code can update the self attendance in the Event.
Eric Fischer [Thu, 1 Oct 2009 23:56:02 +0000 (16:56 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Michael Chan [Thu, 1 Oct 2009 22:12:02 +0000 (15:12 -0700)]
am
f6333c6f: am
be7b0ac4: Merge change I30c38243 into eclair
Merge commit '
f6333c6f0e103e5664fd52aa4f35c5b7c67194c9'
* commit '
f6333c6f0e103e5664fd52aa4f35c5b7c67194c9':
b/
1972231 A tweak to improve on going to a specific time in the agenda view e.g. from weekview or widget.
Michael Chan [Thu, 1 Oct 2009 22:11:59 +0000 (15:11 -0700)]
am
3adf2c5a: am
6e9faeff: Merge change I6148797f into eclair
Merge commit '
3adf2c5affaac19f8aa9418043817c5654921106'
* commit '
3adf2c5affaac19f8aa9418043817c5654921106':
Round off new events created from the month view... if the user previously did "Go to Today"
Ken Shirriff [Thu, 1 Oct 2009 20:54:04 +0000 (13:54 -0700)]
am
7d6f0fa4: am
9a4774c1: Merge change I710d4ade into eclair
Merge commit '
7d6f0fa4057a9864523233d1ede54439aa1b45de'
* commit '
7d6f0fa4057a9864523233d1ede54439aa1b45de':
Add hasAttendeeData for new events.
Michael Chan [Thu, 1 Oct 2009 20:49:34 +0000 (13:49 -0700)]
am
bbb3843a: am
82103d23: Merge change Iddaa2885 into eclair
Merge commit '
bbb3843a52cd665ad45c6ecc9fd1a130599e014e'
* commit '
bbb3843a52cd665ad45c6ecc9fd1a130599e014e':
b/
2158629 Fixed the problem where inviting attendees with pretty display names do not work e.g. "Silly Mike" <mike@mike.com>.
Evan Millar [Thu, 1 Oct 2009 20:45:58 +0000 (13:45 -0700)]
Michael Chan [Thu, 1 Oct 2009 20:45:54 +0000 (13:45 -0700)]
am
18495df3: am
c89f750e: Merge change I161a5026 into eclair
Merge commit '
18495df30229578abc1ff209526a8a0fe5832f96'
* commit '
18495df30229578abc1ff209526a8a0fe5832f96':
b/
2157070 Fixed the Calendar event reminder alert.
Evan Millar [Thu, 1 Oct 2009 18:59:11 +0000 (11:59 -0700)]
am
51b15845: am
08816769: Change FasttrackBadgeWidget->QuickContactBadge
Merge commit '
51b158459a0535a52b32494555c6f2b420ac0980'
* commit '
51b158459a0535a52b32494555c6f2b420ac0980':
Change FasttrackBadgeWidget->QuickContactBadge
Mike Cleron [Thu, 1 Oct 2009 18:54:24 +0000 (11:54 -0700)]
Daniel Sandler [Thu, 1 Oct 2009 18:48:58 +0000 (11:48 -0700)]
Michael Chan [Thu, 1 Oct 2009 18:44:49 +0000 (11:44 -0700)]
am
e0f5f762: am
9b67695b: Merge change I404f895f into eclair
Merge commit '
e0f5f762ef5593faaf29fa030c86ecbe6eeac20f'
* commit '
e0f5f762ef5593faaf29fa030c86ecbe6eeac20f':
b/
2078757 Validate the authority of the intent.
Mike Cleron [Thu, 1 Oct 2009 18:10:56 +0000 (11:10 -0700)]
Michael Chan [Thu, 1 Oct 2009 13:42:41 +0000 (06:42 -0700)]
am
be7b0ac4: Merge change I30c38243 into eclair
Merge commit '
be7b0ac43ad46dd7525f4e1b50aebde035bbd1c6' into eclair-plus-aosp
* commit '
be7b0ac43ad46dd7525f4e1b50aebde035bbd1c6':
b/
1972231 A tweak to improve on going to a specific time in the agenda view e.g. from weekview or widget.
Michael Chan [Thu, 1 Oct 2009 13:42:37 +0000 (06:42 -0700)]
am
6e9faeff: Merge change I6148797f into eclair
Merge commit '
6e9faeff151307482ff5696eaea391ea4e75685e' into eclair-plus-aosp
* commit '
6e9faeff151307482ff5696eaea391ea4e75685e':
Round off new events created from the month view... if the user previously did "Go to Today"
Android (Google) Code Review [Thu, 1 Oct 2009 13:38:19 +0000 (09:38 -0400)]
Merge change I30c38243 into eclair
* changes:
b/
1972231 A tweak to improve on going to a specific time in the agenda view e.g. from weekview or widget.
Android (Google) Code Review [Thu, 1 Oct 2009 13:37:48 +0000 (09:37 -0400)]
Merge change I6148797f into eclair
* changes:
Round off new events created from the month view... if the user previously did "Go to Today"
Michael Chan [Thu, 1 Oct 2009 07:21:59 +0000 (00:21 -0700)]
b/
1972231 A tweak to improve on going to a specific time in the agenda view e.g. from weekview or widget.
The root problem is that ListView ignores my setSelection() call if
notifyDataSetChange is called before it has a chance to redraw. This can happen
when Agenda view starts up and fires off multiple queries.
Change-Id: I30c382432961dbf2d7788723343764b51a665657
Michael Chan [Thu, 1 Oct 2009 07:16:42 +0000 (00:16 -0700)]
Round off new events created from the month view... if the user previously did "Go to Today"
Change-Id: I6148797f9d8c36c65828738fb5ad236577556bcd
Ken Shirriff [Thu, 1 Oct 2009 06:36:58 +0000 (23:36 -0700)]
am
9a4774c1: Merge change I710d4ade into eclair
Merge commit '
9a4774c1516acb621dbd6be7b31dbabf56b39f3d' into eclair-plus-aosp
* commit '
9a4774c1516acb621dbd6be7b31dbabf56b39f3d':
Add hasAttendeeData for new events.
Android (Google) Code Review [Thu, 1 Oct 2009 06:32:33 +0000 (02:32 -0400)]
Merge change I710d4ade into eclair
* changes:
Add hasAttendeeData for new events.
Ken Shirriff [Thu, 1 Oct 2009 06:17:05 +0000 (23:17 -0700)]
Add hasAttendeeData for new events.
This is necessary for the guests field to be editable before the event is synced.
Michael Chan [Thu, 1 Oct 2009 04:53:56 +0000 (21:53 -0700)]
am
82103d23: Merge change Iddaa2885 into eclair
Merge commit '
82103d230a79eca84ba4357962b2a4e4eccaee7d' into eclair-plus-aosp
* commit '
82103d230a79eca84ba4357962b2a4e4eccaee7d':
b/
2158629 Fixed the problem where inviting attendees with pretty display names do not work e.g. "Silly Mike" <mike@mike.com>.
OSDN Git Service
