OSDN Git Service
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
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.
Android (Google) Code Review [Thu, 1 Oct 2009 04:46:07 +0000 (00:46 -0400)]
Merge change Iddaa2885 into eclair
* changes:
b/
2158629 Fixed the problem where inviting attendees with pretty display names do not work e.g. "Silly Mike" <mike@mike.com>.
Michael Chan [Thu, 1 Oct 2009 04:37:22 +0000 (21:37 -0700)]
b/
2158629 Fixed the problem where inviting attendees with pretty display names do not work e.g. "Silly Mike" <mike@mike.com>.
Change-Id: Iddaa2885be1a89479e06e336c902b53461414dac
Evan Millar [Thu, 1 Oct 2009 02:29:25 +0000 (19:29 -0700)]
Fasttrack->QuickContact
Change-Id: I78c9166f01511172f2ba72fc2d595014e7690bd7
Android (Google) Code Review [Thu, 1 Oct 2009 00:55:13 +0000 (20:55 -0400)]
Merge change I161a5026 into eclair
* changes:
b/
2157070 Fixed the Calendar event reminder alert.
Michael Chan [Wed, 30 Sep 2009 18:44:16 +0000 (11:44 -0700)]
b/
2157070 Fixed the Calendar event reminder alert.
Change-Id: I161a5026307717209f98e3e14394e13ab6a592cf
Evan Millar [Wed, 30 Sep 2009 01:08:53 +0000 (18:08 -0700)]
Change FasttrackBadgeWidget->QuickContactBadge
Change-Id: Ib2c1fa93fe92833b4dd13ab4552816ed12904765
Mike Cleron [Wed, 30 Sep 2009 08:11:42 +0000 (01:11 -0700)]
Newer icons
Android (Google) Code Review [Wed, 30 Sep 2009 04:35:38 +0000 (00:35 -0400)]
Merge change Ie7acf3bd into eclair
* changes:
New hdpi assets.
Daniel Sandler [Wed, 30 Sep 2009 04:32:02 +0000 (00:32 -0400)]
New hdpi assets.
Drop dated 29-Sep-2009.
Change-Id: Ie7acf3bddad2b09087458ad23ed96031e00b3ab8
Android (Google) Code Review [Wed, 30 Sep 2009 01:10:42 +0000 (21:10 -0400)]
Merge change I404f895f into eclair
* changes:
b/
2078757 Validate the authority of the intent.
Michael Chan [Tue, 29 Sep 2009 21:46:44 +0000 (14:46 -0700)]
b/
2078757 Validate the authority of the intent.
Change-Id: I404f895fc17f522c53b43e6a6e76eb8e175f7aa2
Mike Cleron [Tue, 29 Sep 2009 06:59:52 +0000 (23:59 -0700)]
New icons
Michael Chan [Mon, 28 Sep 2009 23:50:46 +0000 (16:50 -0700)]
b/
2113463 Fixed Flickering of screen when we move from month view to day view and vice versa
Change-Id: I2f96578f2697225182f85c49efe499337151a039
Android (Google) Code Review [Tue, 29 Sep 2009 00:02:10 +0000 (20:02 -0400)]
Merge change I6d696a98 into eclair
* changes:
b/
2123455 Single tap on an event will always launch the event details.
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 00:32:35 +0000 (17:32 -0700)]
Renaming Presence and Presence-related columns.
Change-Id: I6740a0ff129648f6dabc52dae55c05c434673ac2
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.
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 06:35:31 +0000 (23:35 -0700)]
b/
2123455 Single tap on an event will always launch the event details.
Previously,
a "short" press would trigger the hover card. This has been removed.
a "medium" press would launch the event details.
a "long" press woudl trigger the long press menu.
Change-Id: I6d696a988e11fdd3d06950ed89048f4efbc0064f
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 [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().
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 03:34:37 +0000 (20:34 -0700)]
only add new attendees, delete removed attendees on event edits.
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.
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
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:33:41 +0000 (17:33 -0700)]
Fix bug2123514 and a handful of other string edits.
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.
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 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.
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 21:29:16 +0000 (14:29 -0700)]
Import revised translations. DO NOT MERGE
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 [Tue, 15 Sep 2009 21:44:43 +0000 (14:44 -0700)]
b/
2106929 Resume to previous calendar view.
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"
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
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 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 [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 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 20:14:58 +0000 (13:14 -0700)]
b/
1565071 Rename the string "Presence" to "Show me as" to match the web ui for Calendar.
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 [Tue, 8 Sep 2009 23:25:30 +0000 (16:25 -0700)]
Import revised translations. DO NOT MERGE
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.
Michael Chan [Mon, 31 Aug 2009 06:28:46 +0000 (23:28 -0700)]
- 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 appropritate i.e. has write calendar access and (event creator or guest_can_edit flag on)
Michael Chan [Mon, 31 Aug 2009 06:28:03 +0000 (23:28 -0700)]
- 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
Daniel Sandler [Fri, 28 Aug 2009 18:51:55 +0000 (14:51 -0400)]
High-resolution (hdpi) artwork from TAT for Calendar.
Android (Google) Code Review [Fri, 28 Aug 2009 16:58:43 +0000 (09:58 -0700)]
Merge change 23090 into eclair
* changes:
No more guessing. Save the attendence response to the correct attendee. Show the attendence response option only when appropriate. b/
2061105
Android (Google) Code Review [Fri, 28 Aug 2009 16:57:15 +0000 (09:57 -0700)]
Merge change 23093 into eclair
* changes:
Revert the new back behavior change. It was causing views to not go to the right time. b/
2077287 b/
2076791
Michael Chan [Fri, 28 Aug 2009 12:36:02 +0000 (05:36 -0700)]
No more guessing. Save the attendence response to the correct attendee. Show the attendence response option only when appropriate.
b/
2061105
Michael Chan [Fri, 28 Aug 2009 12:51:54 +0000 (05:51 -0700)]
Revert the new back behavior change. It was causing views to not go to the right time.
b/
2077287 b/
2076791
Michael Chan [Fri, 28 Aug 2009 12:47:59 +0000 (05:47 -0700)]
b/
2049942 Remove debug P: string in agenda view
Michael Chan [Tue, 25 Aug 2009 06:22:25 +0000 (23:22 -0700)]
- Update eventinfo to use the new contacts2 api
- Added sorting to the guests
- Improved performance on start of event info.
- Less change of ANRs on launch since queries are moved to background thread
- Integration with the fast track
Jeff Hamilton [Fri, 21 Aug 2009 23:40:10 +0000 (18:40 -0500)]
Don't load presence as it's not working right now.
Michael Chan [Mon, 17 Aug 2009 17:45:51 +0000 (10:45 -0700)]
b/
1997693 Updated Calendar app to support other screen densities
Eric Fischer [Tue, 18 Aug 2009 18:00:34 +0000 (11:00 -0700)]
am
c8c1fc5c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
c8c1fc5c8dea938c44518deeeb2e5c38968d19e1' into eclair
* commit '
c8c1fc5c8dea938c44518deeeb2e5c38968d19e1':
Import revised translations. DO NOT MERGE
Michael Chan [Mon, 17 Aug 2009 21:27:07 +0000 (14:27 -0700)]
Enable event title in the calendar week view
If the event box is big enough, the event title will be shown just like in the Day view.
That include:
1) events longer than 1 hour unless in portrait mode and
the event overlaps with another event in the same period,
2) events longer than 1 hour unless in landscape mode and
the event overlaps with more than 2 events in the same time period,
3) all day events unless there are too many of them,
Eric Fischer [Mon, 17 Aug 2009 20:14:27 +0000 (13:14 -0700)]
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Mon, 17 Aug 2009 17:42:36 +0000 (10:42 -0700)]
Merge change 21409 into eclair
* changes:
b/
1438315 Fixed back behavior for Calendar.
Fred Quintana [Sun, 16 Aug 2009 04:47:53 +0000 (21:47 -0700)]
Michael Chan [Sat, 15 Aug 2009 04:03:41 +0000 (21:03 -0700)]
b/
2008662 Fixed the problem with Calendar crashing on startup.
The root cause is somewhere in the framework so this is a workaround
until that gets fixed.
Michael Chan [Sat, 15 Aug 2009 03:50:21 +0000 (20:50 -0700)]
b/
1438315 Fixed back behavior for Calendar.
When traversing among the Agenda, Day, Week, and Month views, only one instance of each view
will be saved in the activity stack. For example, if one were to go to Agenda, Day, Week, Day,
then Agenda, pressing the back multiple times from Agenda view will yield the following: Day,
Week, then Home.
Michael Chan [Wed, 12 Aug 2009 18:00:32 +0000 (11:00 -0700)]
b/
1946035 Fixed the crash that happen when the user clicks on the where field but Maps is not installed.
The new behavior is to drop the touch event if the system fails to find
an app that handles the intent.
Michael Chan [Sat, 8 Aug 2009 00:17:56 +0000 (17:17 -0700)]
Fixed the crash that happens when you change orientation while scrolling in agenda view
Michael Chan [Thu, 6 Aug 2009 23:20:28 +0000 (16:20 -0700)]
Calendar attendees and reminder fixes
- b/
2027729 Fixed the crash that happens when you change orientation while scrolling in agenda view
- b/
2038978 Fixed the crash where all the attendees were previous removed by an error
- b/
2033853 Fixed the problem where reminders weren't being saved.
- b/
2027740 Improved logic on when to allow the user to supply a response to an event. It is still not perfect as we are wait for more
- b/
2024425 Allow the user to delete the event even if they didn't create the event
- b/
2030453 Hide delete button when creating new events
- Fixed the crash that happens when you click on revert while creating new events (only happens when you have an empty calendar)
- Improved performance by writing the attendees to the content provider iif they have changed.
- Fixed the title bar to correctly say "View Event" or "View Meeting Invitation" depending on the event.
- Fixed the problem where existing attendees weren't shown during edit event.
info from the server team.
- Added rect info in the intent SHOW_OR_CREATE_CONTACT. Can't test yet as my phone has contact sync problems.
Michael Chan [Wed, 5 Aug 2009 23:19:46 +0000 (16:19 -0700)]
am
d51f415d: (-s ours) b/
2027729 Fixed the crash that happens when you change orientation while scrolling in agenda view - DO NOT MERGE
Merge commit '
d51f415d14845bb83008130ada14d87b2d03e490'
* commit '
d51f415d14845bb83008130ada14d87b2d03e490':
b/
2027729 Fixed the crash that happens when you change orientation while scrolling in agenda view - DO NOT MERGE
Michael Chan [Wed, 5 Aug 2009 22:35:41 +0000 (15:35 -0700)]
b/
2027729 Fixed the crash that happens when you change orientation while scrolling in agenda view - DO NOT MERGE
Eric Fischer [Tue, 4 Aug 2009 17:51:55 +0000 (10:51 -0700)]
resolved conflicts for merge of
72f0026f to master
Jean-Baptiste Queru [Tue, 4 Aug 2009 16:00:28 +0000 (09:00 -0700)]
merge from open-source master
Eric Fischer [Tue, 4 Aug 2009 00:53:29 +0000 (17:53 -0700)]
Look up the localized name of the time zone of the Calendar event.
Previously it was just displaying the ID of the zone, which is fine
for English speakers but not so good for other writing systems.
Bug
2022197
Eric Fischer [Mon, 3 Aug 2009 23:42:52 +0000 (16:42 -0700)]
am
0b6132ba: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
0b6132ba2c5283fb273f6b2b0c1255378314319e'
* commit '
0b6132ba2c5283fb273f6b2b0c1255378314319e':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 3 Aug 2009 23:08:06 +0000 (16:08 -0700)]
Import revised translations. DO NOT MERGE
Michael Chan [Sat, 1 Aug 2009 00:06:14 +0000 (17:06 -0700)]
Temp change to enable Event Response spinner (Yes/No/Maybe) for all events
This is done in order to pass FAST tests. This needs to be removed once
the real fix comes in i.e. content provider providers user relationship
info via the event table.
Michael Chan [Thu, 23 Jul 2009 23:01:07 +0000 (16:01 -0700)]
Initial implementation of guest invitation and status
Added a number of TODO's which will be taken care of later. Performance
needs to be improved. Also changed some of the content provider calls
to the batch API.
Jean-Baptiste Queru [Wed, 29 Jul 2009 21:57:05 +0000 (14:57 -0700)]
merge from donut
Jean-Baptiste Queru [Sun, 26 Jul 2009 18:43:55 +0000 (11:43 -0700)]
reconcile korg/master into goog/master
Jean-Baptiste Queru [Sun, 26 Jul 2009 00:48:03 +0000 (17:48 -0700)]
Merge korg/donut into korg/master
Fred Quintana [Thu, 23 Jul 2009 03:01:03 +0000 (20:01 -0700)]
update the permissions for the AccountManagerService
Android (Google) Code Review [Fri, 17 Jul 2009 22:43:19 +0000 (15:43 -0700)]
am
d8e2033d: Merge change 7631 into donut
Merge commit '
d8e2033d3f44e708f4fb5cfa4fc4f57485860191'
* commit '
d8e2033d3f44e708f4fb5cfa4fc4f57485860191':
b/
1915565 Fixed ANR when snoozing or dismissing calendar notifications
Android (Google) Code Review [Fri, 17 Jul 2009 18:11:39 +0000 (11:11 -0700)]
Merge change 7631 into donut
* changes:
b/
1915565 Fixed ANR when snoozing or dismissing calendar notifications
Michael Chan [Fri, 17 Jul 2009 00:41:59 +0000 (17:41 -0700)]
b/
1915565 Fixed ANR when snoozing or dismissing calendar notifications
DB calls are all moved from the UI thread to a background thread.
Android (Google) Code Review [Thu, 16 Jul 2009 22:25:00 +0000 (15:25 -0700)]
Merge change 5874
* changes:
Modified Agenda view to support scrolling beyond the month boundary.
Michael Chan [Thu, 16 Jul 2009 18:47:44 +0000 (11:47 -0700)]
resolved conflicts for merge of
8c5ade7c to master
Android (Google) Code Review [Thu, 16 Jul 2009 18:11:26 +0000 (11:11 -0700)]
Merge change 7361 into donut
* changes:
b/
1972231 Fixed the problem where the calendar was not showing the next event when launched from widget