OSDN Git Service
Debajit Ghosh [Mon, 28 Sep 2009 18:11:39 +0000 (11:11 -0700)]
am
cfe80263: am
668b7111: fix bug in event response logic: if guests have been hidden, you should be able to respond to the event.
Merge commit '
cfe802633368dcee6edefd18f82668592bc86c5c'
* commit '
cfe802633368dcee6edefd18f82668592bc86c5c':
fix bug in event response logic: if guests have been hidden, you should be able to respond to the event.
Debajit Ghosh [Mon, 28 Sep 2009 18:07:18 +0000 (11:07 -0700)]
am
668b7111: fix bug in event response logic: if guests have been hidden, you should be able to respond to the event.
Merge commit '
668b7111b25e97339a906ddfb6f8e84f59e8e885' into eclair-plus-aosp
* commit '
668b7111b25e97339a906ddfb6f8e84f59e8e885':
fix bug in event response logic: if guests have been hidden, you should be able to respond to the event.
Debajit Ghosh [Mon, 28 Sep 2009 07:04:20 +0000 (00:04 -0700)]
fix bug in event response logic: if guests have been hidden, you should be able to respond to the event.
Dmitri Plotnikov [Mon, 28 Sep 2009 17:05:02 +0000 (10:05 -0700)]
am
13899b92: am
0f30a3a8: Renaming Presence and Presence-related columns.
Merge commit '
13899b927124b881f3462e479546d00531d87a58'
* commit '
13899b927124b881f3462e479546d00531d87a58':
Renaming Presence and Presence-related columns.
Debajit Ghosh [Mon, 28 Sep 2009 17:02:22 +0000 (10:02 -0700)]
am
7faaffba: am
2a5232dd: Merge change 27334 into eclair
Merge commit '
7faaffba4df81b6ac8c8a9c88ab302639ab47fe1'
* commit '
7faaffba4df81b6ac8c8a9c88ab302639ab47fe1':
make EventInfoActivity handle hasAttendeeData.
Ken Shirriff [Mon, 28 Sep 2009 17:01:24 +0000 (10:01 -0700)]
am
1817153f: am
670889f7: Merge change 27326 into eclair
Merge commit '
1817153f9a788e7d6b233e4c74576bc5f2e0f848'
* commit '
1817153f9a788e7d6b233e4c74576bc5f2e0f848':
Use onStartCommand() in AlertService.
Dmitri Plotnikov [Mon, 28 Sep 2009 03:00:00 +0000 (20:00 -0700)]
am
0f30a3a8: Renaming Presence and Presence-related columns.
Merge commit '
0f30a3a8e8cd6bfba414390e91177b5df2154daf' into eclair-plus-aosp
* commit '
0f30a3a8e8cd6bfba414390e91177b5df2154daf':
Renaming Presence and Presence-related columns.
Dmitri Plotnikov [Mon, 28 Sep 2009 00:32:35 +0000 (17:32 -0700)]
Renaming Presence and Presence-related columns.
Change-Id: I6740a0ff129648f6dabc52dae55c05c434673ac2
Debajit Ghosh [Mon, 28 Sep 2009 00:11:17 +0000 (17:11 -0700)]
am
2a5232dd: Merge change 27334 into eclair
Merge commit '
2a5232ddf4c073b8cdaac7884624d0f6f207ef9e' into eclair-plus-aosp
* commit '
2a5232ddf4c073b8cdaac7884624d0f6f207ef9e':
make EventInfoActivity handle hasAttendeeData.
Android (Google) Code Review [Mon, 28 Sep 2009 00:02:11 +0000 (20:02 -0400)]
Merge change 27334 into eclair
* changes:
make EventInfoActivity handle hasAttendeeData.
Ken Shirriff [Sun, 27 Sep 2009 23:54:25 +0000 (16:54 -0700)]
am
670889f7: Merge change 27326 into eclair
Merge commit '
670889f7e328330909c99f36b35e7a84e2927511' into eclair-plus-aosp
* commit '
670889f7e328330909c99f36b35e7a84e2927511':
Use onStartCommand() in AlertService.
Debajit Ghosh [Sun, 27 Sep 2009 23:08:29 +0000 (16:08 -0700)]
make EventInfoActivity handle hasAttendeeData.
only show organizer if we know the organizer and if we're not the organizer.
only allow editing response if we're not the organizer.
show the event as an invite if we're not the organizer.
Android (Google) Code Review [Sun, 27 Sep 2009 23:02:12 +0000 (19:02 -0400)]
Merge change 27326 into eclair
* changes:
Use onStartCommand() in AlertService.
Ken Shirriff [Sun, 27 Sep 2009 22:21:09 +0000 (15:21 -0700)]
Use onStartCommand() in AlertService.
This service is supposed to handle an intent, so it uses START_REDELIVER_INTENT
to make sure the intent is handled.
Michael Chan [Sun, 27 Sep 2009 22:42:04 +0000 (15:42 -0700)]
am
d94753fc: am
72ee2270: b/
2138277 Hide the Guests editview if has_attendees is false
Merge commit '
d94753fcbb727e0f639c8759d4b10fe6fc285926'
* commit '
d94753fcbb727e0f639c8759d4b10fe6fc285926':
b/
2138277 Hide the Guests editview if has_attendees is false
Michael Chan [Fri, 25 Sep 2009 23:35:40 +0000 (16:35 -0700)]
am
72ee2270: b/
2138277 Hide the Guests editview if has_attendees is false
Merge commit '
72ee2270002d0f1b2a5a96231fe17dc65282652a' into eclair-plus-aosp
* commit '
72ee2270002d0f1b2a5a96231fe17dc65282652a':
b/
2138277 Hide the Guests editview if has_attendees is false
Ken Shirriff [Fri, 25 Sep 2009 18:06:47 +0000 (11:06 -0700)]
Michael Chan [Fri, 25 Sep 2009 18:00:26 +0000 (11:00 -0700)]
am
09bcaa08: am
91a9a8b6: Merge change 26789 into eclair
Merge commit '
09bcaa08c93bb61ab8f3c4404a09765741d95742'
* commit '
09bcaa08c93bb61ab8f3c4404a09765741d95742':
b/
2071368 Switch to use the new fasttrack widget and asset from the framework
Debajit Ghosh [Fri, 25 Sep 2009 17:51:24 +0000 (10:51 -0700)]
am
098ef795: am
23b83547: only add new attendees, delete removed attendees on event edits.
Merge commit '
098ef7954dc235b6b9db22e4152ce665256de728'
* commit '
098ef7954dc235b6b9db22e4152ce665256de728':
only add new attendees, delete removed attendees on event edits.
Michael Chan [Thu, 24 Sep 2009 06:11:11 +0000 (23:11 -0700)]
b/
2138277 Hide the Guests editview if has_attendees is false
Change-Id: Iec9cb36534fdf0e8c5dce7bb67b91f55c6d2a467
Ken Shirriff [Thu, 24 Sep 2009 17:42:24 +0000 (10:42 -0700)]
am
a8e4ada7: Fix calendar edit NPE.
Merge commit '
a8e4ada7a25aa0d56d668e1d6f836c8a6ea8242c' into eclair-plus-aosp
* commit '
a8e4ada7a25aa0d56d668e1d6f836c8a6ea8242c':
Fix calendar edit NPE.
Ken Shirriff [Tue, 22 Sep 2009 23:34:51 +0000 (16:34 -0700)]
Fix calendar edit NPE.
mCalendarsCursor could be null, so get the owner account from onCreate().
Michael Chan [Thu, 24 Sep 2009 05:38:26 +0000 (22:38 -0700)]
am
91a9a8b6: Merge change 26789 into eclair
Merge commit '
91a9a8b618ab64d5decb9198a9fb57d86e74a210' into eclair-plus-aosp
* commit '
91a9a8b618ab64d5decb9198a9fb57d86e74a210':
b/
2071368 Switch to use the new fasttrack widget and asset from the framework
Android (Google) Code Review [Thu, 24 Sep 2009 05:31:32 +0000 (01:31 -0400)]
Merge change 26789 into eclair
* changes:
b/
2071368 Switch to use the new fasttrack widget and asset from the framework Removed the user's status from the list because 1) it doesn't make sense for event without other guests and 2) there's a response spinner for events with guests. b/
2092806 Eliminate the unneeded badge refreshes after fasttrack goes away
Michael Chan [Wed, 23 Sep 2009 18:37:38 +0000 (11:37 -0700)]
b/
2071368 Switch to use the new fasttrack widget and asset from the framework
Removed the user's status from the list because
1) it doesn't make sense for event without other guests and
2) there's a response spinner for events with guests.
b/
2092806 Eliminate the unneeded badge refreshes after fasttrack goes away
Change-Id: I5a2d7d3265dce97b23e279259ed0541247f7123a
Debajit Ghosh [Wed, 23 Sep 2009 20:28:04 +0000 (13:28 -0700)]
am
23b83547: only add new attendees, delete removed attendees on event edits.
Merge commit '
23b83547cc5d60a173b61c2dc2e627ce7c14f665' into eclair-plus-aosp
* commit '
23b83547cc5d60a173b61c2dc2e627ce7c14f665':
only add new attendees, delete removed attendees on event edits.
Debajit Ghosh [Wed, 23 Sep 2009 03:34:37 +0000 (20:34 -0700)]
only add new attendees, delete removed attendees on event edits.
Michael Chan [Tue, 22 Sep 2009 05:20:44 +0000 (22:20 -0700)]
am
abc5ae35: am
e02f5883: Merge change 26251 into eclair
Merge commit '
abc5ae353f7287e5ab5f6be6a76dea89e0fa3a71'
* commit '
abc5ae353f7287e5ab5f6be6a76dea89e0fa3a71':
b/
2123503 Fixed getEventByPosition() to return the local timezone for begin time for all day events instead of UTC.
Michael Chan [Tue, 22 Sep 2009 05:12:55 +0000 (22:12 -0700)]
am
e02f5883: Merge change 26251 into eclair
Merge commit '
e02f58831f2ad5c98456e80f446e4700fed3be1d' into eclair-plus-aosp
* commit '
e02f58831f2ad5c98456e80f446e4700fed3be1d':
b/
2123503 Fixed getEventByPosition() to return the local timezone for begin time for all day events instead of UTC.
Android (Google) Code Review [Tue, 22 Sep 2009 05:04:06 +0000 (01:04 -0400)]
Merge change 26251 into eclair
* changes:
b/
2123503 Fixed getEventByPosition() to return the local timezone for begin time for all day events instead of UTC. Also return unique item id's so ListView can correctly identify each item.
Dianne Hackborn [Tue, 22 Sep 2009 00:49:45 +0000 (17:49 -0700)]
am
edf8738f: am
ecb9760d: Calendar can now use Theme.NoDisplay now that it works.
Merge commit '
edf8738f05c72bcc9a141b76e13220a815a6908d'
* commit '
edf8738f05c72bcc9a141b76e13220a815a6908d':
Calendar can now use Theme.NoDisplay now that it works.
Dianne Hackborn [Tue, 22 Sep 2009 00:44:22 +0000 (17:44 -0700)]
am
ecb9760d: Calendar can now use Theme.NoDisplay now that it works.
Merge commit '
ecb9760db0d4a0c7996980f9e2de8adf0a92f36e' into eclair-plus-aosp
* commit '
ecb9760db0d4a0c7996980f9e2de8adf0a92f36e':
Calendar can now use Theme.NoDisplay now that it works.
Michael Chan [Fri, 18 Sep 2009 00:41:07 +0000 (17:41 -0700)]
b/
2123503 Fixed getEventByPosition() to return the local timezone for begin time for all day events instead of UTC.
Also return unique item id's so ListView can correctly identify each item.
Change-Id: Ic93a6a717145adbaf4f997f3e914c236dd2f6c61
Dianne Hackborn [Mon, 21 Sep 2009 07:36:12 +0000 (00:36 -0700)]
Calendar can now use Theme.NoDisplay now that it works.
Change-Id: I66c38ea8d9551be7e499b12d8240deae00fb0666
Debajit Ghosh [Mon, 21 Sep 2009 06:06:52 +0000 (23:06 -0700)]
am
15d962d5: am
1febbe31: Merge change 26091 into eclair
Merge commit '
15d962d570008c688e7b41f64294dc82138f2403'
* commit '
15d962d570008c688e7b41f64294dc82138f2403':
be sure to close the presence cursor when displaying event info.
Debajit Ghosh [Mon, 21 Sep 2009 04:38:06 +0000 (21:38 -0700)]
am
1febbe31: Merge change 26091 into eclair
Merge commit '
1febbe315f7de86786bd953394773fc279e5939f' into eclair-plus-aosp
* commit '
1febbe315f7de86786bd953394773fc279e5939f':
be sure to close the presence cursor when displaying event info.
Android (Google) Code Review [Mon, 21 Sep 2009 04:30:23 +0000 (00:30 -0400)]
Merge change 26091 into eclair
* changes:
be sure to close the presence cursor when displaying event info.
Debajit Ghosh [Mon, 21 Sep 2009 01:16:53 +0000 (18:16 -0700)]
be sure to close the presence cursor when displaying event info.
Roy West [Mon, 21 Sep 2009 00:56:48 +0000 (17:56 -0700)]
am
dc81c6d0: am
214dbb45: Fix bug2123514 and a handful of other string edits.
Merge commit '
dc81c6d014bba6392730ed00e36518fb812946dc'
* commit '
dc81c6d014bba6392730ed00e36518fb812946dc':
Fix bug2123514 and a handful of other string edits.
Roy West [Mon, 21 Sep 2009 00:51:49 +0000 (17:51 -0700)]
am
214dbb45: Fix bug2123514 and a handful of other string edits.
Merge commit '
214dbb45a93996a8cbc697864f5fe55a5447abca' into eclair-plus-aosp
* commit '
214dbb45a93996a8cbc697864f5fe55a5447abca':
Fix bug2123514 and a handful of other string edits.
Roy West [Mon, 21 Sep 2009 00:33:41 +0000 (17:33 -0700)]
Fix bug2123514 and a handful of other string edits.
Dmitri Plotnikov [Sun, 20 Sep 2009 15:03:21 +0000 (08:03 -0700)]
am
6942ae0d: am
a886a23c: Merge change 25848 into eclair
Merge commit '
6942ae0d131d4ad750acf4f7a9a1fa989271d863'
* commit '
6942ae0d131d4ad750acf4f7a9a1fa989271d863':
Switching to streamlined naming of contact Data columns.
Dmitri Plotnikov [Sun, 20 Sep 2009 14:54:46 +0000 (07:54 -0700)]
am
a886a23c: Merge change 25848 into eclair
Merge commit '
a886a23cf162fdad6ca0e25441550a3783f0cd29' into eclair-plus-aosp
* commit '
a886a23cf162fdad6ca0e25441550a3783f0cd29':
Switching to streamlined naming of contact Data columns.
Android (Google) Code Review [Sun, 20 Sep 2009 14:49:28 +0000 (10:49 -0400)]
Merge change 25848 into eclair
* changes:
Switching to streamlined naming of contact Data columns.
Debajit Ghosh [Sat, 19 Sep 2009 02:39:41 +0000 (19:39 -0700)]
am
67b89930: am
9d694dfb: fix bug where the default reminders get added in onRestore(), rather than once in onCreate().
Merge commit '
67b89930664199491b2fa219d5930d4df4ccf7c7'
* commit '
67b89930664199491b2fa219d5930d4df4ccf7c7':
fix bug where the default reminders get added in onRestore(), rather than once in onCreate().
Debajit Ghosh [Sat, 19 Sep 2009 01:37:42 +0000 (18:37 -0700)]
am
9d694dfb: fix bug where the default reminders get added in onRestore(), rather than once in onCreate().
Merge commit '
9d694dfbcaf28dd37ae4161fe1a6c15c50f20b18' into eclair-plus-aosp
* commit '
9d694dfbcaf28dd37ae4161fe1a6c15c50f20b18':
fix bug where the default reminders get added in onRestore(), rather than once in onCreate().
Dmitri Plotnikov [Fri, 18 Sep 2009 22:51:45 +0000 (15:51 -0700)]
Switching to streamlined naming of contact Data columns.
Change-Id: I42a8f731c8b77eba267ca0dcc5c57e0d893f18ec
Debajit Ghosh [Sat, 19 Sep 2009 00:55:23 +0000 (17:55 -0700)]
fix bug where the default reminders get added in onRestore(), rather than once in onCreate().
Jeff Sharkey [Fri, 18 Sep 2009 07:24:18 +0000 (00:24 -0700)]
am
4e47a59a: am
ec03cbcb: Switch Calendar to new FastTrack API.
Merge commit '
4e47a59a23804d3e502d050a17fd547e17e8669c'
* commit '
4e47a59a23804d3e502d050a17fd547e17e8669c':
Switch Calendar to new FastTrack API.
Jeff Sharkey [Fri, 18 Sep 2009 07:15:16 +0000 (00:15 -0700)]
am
ec03cbcb: Switch Calendar to new FastTrack API.
Merge commit '
ec03cbcb0c39daa717bc2a8216ba5b3a2e9266b2' into eclair-plus-aosp
* commit '
ec03cbcb0c39daa717bc2a8216ba5b3a2e9266b2':
Switch Calendar to new FastTrack API.
Jeff Sharkey [Fri, 18 Sep 2009 04:28:48 +0000 (21:28 -0700)]
Switch Calendar to new FastTrack API.
As part of http://b/
2087222 we have a new API specifically
for launching FastTrack. This allows SHOW_OR_CREATE to be
returned to its original behavior.
I've tested this change and confirmed that it's WAI, and
may have also fixed up some deprecated references.
Debajit Ghosh [Thu, 17 Sep 2009 23:21:04 +0000 (16:21 -0700)]
am
fb992696: am
35c53a5e: Merge change 25436 into eclair
Merge commit '
fb992696b94579f8f9aa1afc81fe0e6d503f838e'
* commit '
fb992696b94579f8f9aa1afc81fe0e6d503f838e':
set the email validator in all cases, to make sure guest email addresses are validated.
Debajit Ghosh [Thu, 17 Sep 2009 23:16:02 +0000 (16:16 -0700)]
am
35c53a5e: Merge change 25436 into eclair
Merge commit '
35c53a5ee41d4a41461fd13221954296d44b88d6' into eclair-plus-aosp
* commit '
35c53a5ee41d4a41461fd13221954296d44b88d6':
set the email validator in all cases, to make sure guest email addresses are validated.
Android (Google) Code Review [Thu, 17 Sep 2009 23:11:20 +0000 (19:11 -0400)]
Merge change 25436 into eclair
* changes:
set the email validator in all cases, to make sure guest email addresses are validated.
Eric Fischer [Thu, 17 Sep 2009 22:23:08 +0000 (15:23 -0700)]
am
201064ec: (-s ours) am
b7a8eced: Import revised translations. DO NOT MERGE
Merge commit '
201064ec8bde9e90e0ee8a53b3237ea1775ba996'
* commit '
201064ec8bde9e90e0ee8a53b3237ea1775ba996':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 22:11:57 +0000 (15:11 -0700)]
am
b7a8eced: Import revised translations. DO NOT MERGE
Merge commit '
b7a8eced3bda89f4019e263184dc883152aef005' into eclair-plus-aosp
* commit '
b7a8eced3bda89f4019e263184dc883152aef005':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 21:29:16 +0000 (14:29 -0700)]
Import revised translations. DO NOT MERGE
Michael Chan [Thu, 17 Sep 2009 19:18:58 +0000 (12:18 -0700)]
am
4a8b7a03: am
e8aa59d4: b/
2106929 Resume to previous calendar view.
Merge commit '
4a8b7a03bfb968729cb1a75c10ff3e908e828c8b'
* commit '
4a8b7a03bfb968729cb1a75c10ff3e908e828c8b':
b/
2106929 Resume to previous calendar view.
Michael Chan [Thu, 17 Sep 2009 19:18:39 +0000 (12:18 -0700)]
am
187e2189: am
96d8043c: Merge change 25365 into eclair
Merge commit '
187e21899112607e1a3680599774273bd0ad3edb'
* commit '
187e21899112607e1a3680599774273bd0ad3edb':
b/
2123505 Change the name of the activity that intercept email links for calendar app from "View Event" to "Calendar"
Michael Chan [Thu, 17 Sep 2009 19:18:36 +0000 (12:18 -0700)]
am
d2912886: am
5be79e8b: Merge change 25453 into eclair
Merge commit '
d2912886acc3b6a2b661da9cb3f7eb109f76629c'
* commit '
d2912886acc3b6a2b661da9cb3f7eb109f76629c':
b/
2126473 Update Calendar Code to handle Back key events when released, not when pressed
Michael Chan [Thu, 17 Sep 2009 19:18:00 +0000 (12:18 -0700)]
am
81daede7: am
b65eacf9: Merge change 25407 into eclair
Merge commit '
81daede79dd4596f653f41801cfcdf90e4736e97'
* commit '
81daede79dd4596f653f41801cfcdf90e4736e97':
b/
2121398 b/
2089742 Fixed auto-complete when adding attendees (by updating to new contacts api)
Michael Chan [Thu, 17 Sep 2009 19:09:52 +0000 (12:09 -0700)]
am
004fdbda: am
6a932902: b/
2110458 Fixed the problem where 2 clicks were needed to invoke fasttrace from EventDetails Fixed the problem where the trackball wasn\'t highlighting the badge.
Merge commit '
004fdbda785576f938c9c136e4929a348070969b'
* commit '
004fdbda785576f938c9c136e4929a348070969b':
b/
2110458 Fixed the problem where 2 clicks were needed to invoke fasttrace from EventDetails
Debajit Ghosh [Thu, 17 Sep 2009 03:23:34 +0000 (20:23 -0700)]
set the email validator in all cases, to make sure guest email addresses are validated.
Michael Chan [Thu, 17 Sep 2009 18:27:04 +0000 (11:27 -0700)]
am
e8aa59d4: b/
2106929 Resume to previous calendar view.
Merge commit '
e8aa59d4575d712601a133a9263acc23adbc8c17' into eclair-plus-aosp
* commit '
e8aa59d4575d712601a133a9263acc23adbc8c17':
b/
2106929 Resume to previous calendar view.
Michael Chan [Tue, 15 Sep 2009 21:44:43 +0000 (14:44 -0700)]
b/
2106929 Resume to previous calendar view.
Michael Chan [Thu, 17 Sep 2009 18:16:42 +0000 (11:16 -0700)]
am
96d8043c: Merge change 25365 into eclair
Merge commit '
96d8043c97aeb4e2713c872a21c60d098836e0fb' into eclair-plus-aosp
* commit '
96d8043c97aeb4e2713c872a21c60d098836e0fb':
b/
2123505 Change the name of the activity that intercept email links for calendar app from "View Event" to "Calendar"
Android (Google) Code Review [Thu, 17 Sep 2009 18:10:13 +0000 (14:10 -0400)]
Merge change 25365 into eclair
* changes:
b/
2123505 Change the name of the activity that intercept email links for calendar app from "View Event" to "Calendar"
Michael Chan [Thu, 17 Sep 2009 18:06:58 +0000 (11:06 -0700)]
am
5be79e8b: Merge change 25453 into eclair
Merge commit '
5be79e8b2a16e2725788f719c8dfcce13381a382' into eclair-plus-aosp
* commit '
5be79e8b2a16e2725788f719c8dfcce13381a382':
b/
2126473 Update Calendar Code to handle Back key events when released, not when pressed
Android (Google) Code Review [Thu, 17 Sep 2009 17:59:38 +0000 (13:59 -0400)]
Merge change 25453 into eclair
* changes:
b/
2126473 Update Calendar Code to handle Back key events when released, not when pressed
Michael Chan [Thu, 17 Sep 2009 17:46:47 +0000 (10:46 -0700)]
am
b65eacf9: Merge change 25407 into eclair
Merge commit '
b65eacf9d7ce61e555ccc4261eab2cb2bf08d059' into eclair-plus-aosp
* commit '
b65eacf9d7ce61e555ccc4261eab2cb2bf08d059':
b/
2121398 b/
2089742 Fixed auto-complete when adding attendees (by updating to new contacts api)
Android (Google) Code Review [Thu, 17 Sep 2009 17:39:12 +0000 (13:39 -0400)]
Merge change 25407 into eclair
* changes:
b/
2121398 b/
2089742 Fixed auto-complete when adding attendees (by updating to new contacts api)
Michael Chan [Thu, 17 Sep 2009 15:46:43 +0000 (08:46 -0700)]
am
6a932902: b/
2110458 Fixed the problem where 2 clicks were needed to invoke fasttrace from EventDetails Fixed the problem where the trackball wasn\'t highlighting the badge.
Merge commit '
6a932902d8380611a3e6ccafc2b3a9534e19dae3' into eclair-plus-aosp
* commit '
6a932902d8380611a3e6ccafc2b3a9534e19dae3':
b/
2110458 Fixed the problem where 2 clicks were needed to invoke fasttrace from EventDetails
Michael Chan [Thu, 17 Sep 2009 06:18:54 +0000 (23:18 -0700)]
b/
2126473 Update Calendar Code to handle Back key events when released, not when pressed
Michael Chan [Thu, 17 Sep 2009 04:30:21 +0000 (21:30 -0700)]
b/
2110458 Fixed the problem where 2 clicks were needed to invoke fasttrace from EventDetails
Fixed the problem where the trackball wasn't highlighting the badge.
Michael Chan [Thu, 17 Sep 2009 00:34:28 +0000 (17:34 -0700)]
b/
2121398 b/
2089742 Fixed auto-complete when adding attendees (by updating to new contacts api)
The code was taken from com.android.email.EmailAddressAdapter and customized for Calendar.
Michael Chan [Wed, 16 Sep 2009 22:17:57 +0000 (15:17 -0700)]
b/
2123505 Change the name of the activity that intercept email links for calendar app from "View Event" to "Calendar"
Michael Chan [Wed, 16 Sep 2009 17:52:07 +0000 (10:52 -0700)]
am
e109ed21: am
ed912e5a: b/
2098570 Mark response as Yes when creating a Calendar event
Merge commit '
e109ed213385c2ff61bd8541846218c79b00dba7'
* commit '
e109ed213385c2ff61bd8541846218c79b00dba7':
b/
2098570 Mark response as Yes when creating a Calendar event
Michael Chan [Tue, 15 Sep 2009 20:19:36 +0000 (13:19 -0700)]
am
f04a3dfe: am
6d34cec5: b/
2098823 Fixed the problem where Delete and Edit Event weren\'t showing in long press menus. Make use of the new organizer and guestCanModifyEvent columns.
Merge commit '
f04a3dfe6106a5d4fbed25745f21de6f70c2e2e4'
* commit '
f04a3dfe6106a5d4fbed25745f21de6f70c2e2e4':
b/
2098823 Fixed the problem where Delete and Edit Event weren't showing in long press menus. Make use of the new organizer and guestCanModifyEvent columns.
Michael Chan [Mon, 14 Sep 2009 04:52:32 +0000 (21:52 -0700)]
am
ed912e5a: b/
2098570 Mark response as Yes when creating a Calendar event
Merge commit '
ed912e5a595274c54ec2d52b9a7868c2063048bb' into eclair-plus-aosp
* commit '
ed912e5a595274c54ec2d52b9a7868c2063048bb':
b/
2098570 Mark response as Yes when creating a Calendar event
Michael Chan [Sat, 12 Sep 2009 00:16:32 +0000 (17:16 -0700)]
b/
2098570 Mark response as Yes when creating a Calendar event
Michael Chan [Fri, 11 Sep 2009 23:48:45 +0000 (16:48 -0700)]
am
6d34cec5: b/
2098823 Fixed the problem where Delete and Edit Event weren\'t showing in long press menus. Make use of the new organizer and guestCanModifyEvent columns.
Merge commit '
6d34cec523930368976bc8d358d0a6de1da3462c' into eclair-plus-aosp
* commit '
6d34cec523930368976bc8d358d0a6de1da3462c':
b/
2098823 Fixed the problem where Delete and Edit Event weren't showing in long press menus. Make use of the new organizer and guestCanModifyEvent columns.
Michael Chan [Fri, 11 Sep 2009 21:42:31 +0000 (14:42 -0700)]
b/
2098823 Fixed the problem where Delete and Edit Event weren't showing in long press menus. Make use of the new organizer and guestCanModifyEvent columns.
Michael Chan [Wed, 9 Sep 2009 23:30:40 +0000 (16:30 -0700)]
am
5e8e76b6: am
782e389d: b/
1565071 Rename the string "Presence" to "Show me as" to match the web ui for Calendar.
Merge commit '
5e8e76b677859e1372ee19c6c169a962f32056f0'
* commit '
5e8e76b677859e1372ee19c6c169a962f32056f0':
b/
1565071 Rename the string "Presence" to "Show me as" to match the web ui for Calendar.
Michael Chan [Wed, 9 Sep 2009 21:40:16 +0000 (14:40 -0700)]
am
782e389d: b/
1565071 Rename the string "Presence" to "Show me as" to match the web ui for Calendar.
Merge commit '
782e389d19f0183c9855117c8752c79a7bff6531' into eclair-plus-aosp
* commit '
782e389d19f0183c9855117c8752c79a7bff6531':
b/
1565071 Rename the string "Presence" to "Show me as" to match the web ui for Calendar.
Michael Chan [Wed, 9 Sep 2009 20:14:58 +0000 (13:14 -0700)]
b/
1565071 Rename the string "Presence" to "Show me as" to match the web ui for Calendar.
Michael Chan [Wed, 9 Sep 2009 17:58:38 +0000 (10:58 -0700)]
am
66714f1a: am
9d9071e4: Merge change 24271 into eclair
Merge commit '
66714f1a3d44f62b0fd3612f09a53a96336cad16'
* commit '
66714f1a3d44f62b0fd3612f09a53a96336cad16':
b/
2102011 Fix the problem where multi-day events may appear multiple times in the Agenda view.
Eric Fischer [Wed, 9 Sep 2009 17:56:42 +0000 (10:56 -0700)]
am
b96d64ad: (-s ours) am
02d36714: Import revised translations. DO NOT MERGE
Merge commit '
b96d64adc8ca9011fb73d19d87470ed544ac3413'
* commit '
b96d64adc8ca9011fb73d19d87470ed544ac3413':
Import revised translations. DO NOT MERGE
Michael Chan [Wed, 9 Sep 2009 00:25:48 +0000 (17:25 -0700)]
am
9d9071e4: Merge change 24271 into eclair
Merge commit '
9d9071e4b6f5c2c2be9b1f1c5d213f1f2ae90ed9' into eclair-plus-aosp
* commit '
9d9071e4b6f5c2c2be9b1f1c5d213f1f2ae90ed9':
b/
2102011 Fix the problem where multi-day events may appear multiple times in the Agenda view.
Android (Google) Code Review [Wed, 9 Sep 2009 00:22:42 +0000 (17:22 -0700)]
Merge change 24271 into eclair
* changes:
b/
2102011 Fix the problem where multi-day events may appear multiple times in the Agenda view.
Michael Chan [Tue, 8 Sep 2009 17:52:58 +0000 (10:52 -0700)]
b/
2102011 Fix the problem where multi-day events may appear multiple times in the Agenda view.
Eric Fischer [Wed, 9 Sep 2009 00:02:39 +0000 (17:02 -0700)]
am
02d36714: Import revised translations. DO NOT MERGE
Merge commit '
02d36714ce7947e4b7e0f07e85f0baf54d8cb542' into eclair-plus-aosp
* commit '
02d36714ce7947e4b7e0f07e85f0baf54d8cb542':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Sep 2009 23:25:30 +0000 (16:25 -0700)]
Import revised translations. DO NOT MERGE
Michael Chan [Sat, 5 Sep 2009 00:47:56 +0000 (17:47 -0700)]
am
066a10e4: am
23f400cd: Fixed a bunch of problems when moving among agenda/day/week/month views.
Merge commit '
066a10e47cd9496eb3048b9e0cc2dbb4ce46c097'
* commit '
066a10e47cd9496eb3048b9e0cc2dbb4ce46c097':
Fixed a bunch of problems when moving among agenda/day/week/month views.
Michael Chan [Sat, 5 Sep 2009 00:46:15 +0000 (17:46 -0700)]
am
23f400cd: Fixed a bunch of problems when moving among agenda/day/week/month views.
Merge commit '
23f400cdb34b08d9003f4a96fca5976ad632e4ce' into eclair-plus-aosp
* commit '
23f400cdb34b08d9003f4a96fca5976ad632e4ce':
Fixed a bunch of problems when moving among agenda/day/week/month views.
Michael Chan [Fri, 14 Aug 2009 20:03:39 +0000 (13:03 -0700)]
Fixed a bunch of problems when moving among agenda/day/week/month views.
b/
1438315 Fixed problems introduced in the new back behavior.
b/
2077287 Fixed the problem where you sometimes end up in 1969 when switch among the agenda/day/week/month views.
b/
2076791 The selected date is preserved when switch to various views.
Removed scroll bar in agenda view as the header was not a static list of events anymore
Cleaned up some TODOs.
Jean-Baptiste Queru [Fri, 4 Sep 2009 18:06:33 +0000 (11:06 -0700)]
Jean-Baptiste Queru [Fri, 4 Sep 2009 14:51:17 +0000 (07:51 -0700)]
merge from open-source master
Jean-Baptiste Queru [Thu, 3 Sep 2009 21:13:12 +0000 (14:13 -0700)]
merge from donut
Michael Chan [Mon, 31 Aug 2009 23:45:05 +0000 (16:45 -0700)]
am
0b69502f: - b/
2067801 Show event organizer in event info - b/
2065026 Moved attendence status on top of other guests\' status - In event info, hide "Add reminder" when adding is not possible i.e. reminders > 5 or busy/free calendar - Show the Edit event option when a
Merge commit '
0b69502f4fd1a9d5111af2f89faca76b39006fde'
* commit '
0b69502f4fd1a9d5111af2f89faca76b39006fde':
- b/
2067801 Show event organizer in event info
Michael Chan [Mon, 31 Aug 2009 23:44:16 +0000 (16:44 -0700)]
am
01620240: - b/
1412318 Edit Event Fit and finish - Added spinner prompts for Calendar, Repeats, Presence, and Privacy. - Pick the email domain of the correct calendar and use it for email validation
Merge commit '
016202408ffd79de1ed53a16aee2a1affd7b1a59'
* commit '
016202408ffd79de1ed53a16aee2a1affd7b1a59':
- b/
1412318 Edit Event Fit and finish - Added spinner prompts for Calendar, Repeats, Presence, and Privacy.