summaryrefslogtreecommitdiffstats
path: root/src/com/android/calendar
Commit message (Collapse)AuthorAgeFilesLines
* b/3095214 Fixed NPE when trying to save an event where the user can't add ↵Michael Chan2010-10-131-3/+9
| | | | | | attendees. Change-Id: I1996abadc80f0755055af996260ed4ba9bc7daf1
* Initialize default calendar permission for new eventsMichael Chan2010-10-132-15/+25
| | | | Change-Id: I6cd8a6a2674b148754c2b0a2e3865f58f07af04f
* Merge "Use long instead of float."Daisuke Miyakawa2010-10-132-8/+9
|\
| * Use long instead of float.Daisuke Miyakawa2010-10-132-8/+9
| | | | | | | | | | Bug: 3091447 Change-Id: I18bd22ee64181db4cd6f6c01cc42be919e8b543c
* | Hide AllDay checkbox from Edit if the event is read-onlyMichael Chan2010-10-132-43/+60
|/ | | | | | | Pass in the correct context to the DeleteWhich dialogs so it will show up with the correct theme Save/delete only if the user has permission Change-Id: I3a80171f20b35c5dcb661baee7ad7800161ba309
* Major bug fixing in EventInfo and EditEventMichael Chan2010-10-115-175/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In EventInfo/Popup: Fixed reminders and response Set a fixed height Renamed Edit event button to Open event in the Event popup Enabled Open event button unless it's a free/busy calendar Removed action bar buttons in Event popup Disallow reminders for busy/free calendars TODO: Update UI only if everything is loaded In Edit Event: Switch to side-by-side label format Have everything ready before removing "Loading" msg Added organizer Restrict adding of attendees: For non-organizers, write permission to the calendar is sufficient. For organizers, the user needs a) write permission to the calendar AND b) ownerCanRespond == true AND c) attendee data exist (this means num of attendees > 1, the calendar owner's and others). TODO: Attendees do not always show up. Need to switch from listview to linear layout TODO: Move to one column format for portrait in EditEvent Turned on Holo.light theme but the light version isn't ready in the framework yet. Removed dependency to android.test.runner b/3052155 b/2709441 b/3060967 b/3060985 Change-Id: I4a25fecf3ade6a7924ba7b55801daced3dca6fa7
* Merge "Small visual changes to month view"Erik2010-10-062-7/+1
|\
| * Small visual changes to month viewErik2010-10-052-7/+1
| | | | | | | | | | | | | | This removes busybits from the mini month view and changes the number of weeks displayed to 6. Change-Id: If1af7862c1335dcd01476bd9dd13e33cb50227f3
* | Adds home tz support to cal widgetErik2010-10-012-22/+60
|/ | | | | | | This change also requires change Ia7b3ad66 to the provider to send a broadcast when the time zone changes. Change-Id: I0bf98dc5adc849328a3b5bf0d8ac17329239c9f6
* Merge "Adds a home time zone clock to Calendar"Erik2010-09-291-0/+47
|\
| * Adds a home time zone clock to CalendarErik2010-09-291-0/+47
| | | | | | | | | | | | | | | | When in a multiPane view and a home time zone other than the phone's time zone is enabled this will display a clock in the home time zone below the calendars list. Change-Id: I2fe7037384c223cd7b5dfca206022b2bee709e52
* | Make remeasure() consider relation between events.Daisuke Miyakawa2010-09-292-35/+47
|/ | | | | | | | | This changes affect the logic in DayView but doesn't affect that in FullMonthView/MiniMonthView, as they don't use column values in Event class. Bug: 3031917 Change-Id: I1815f065fe6c5d14cae995a79b70dd796b482439
* Merge "Makes bubble and event info in search update tz"Erik2010-09-295-11/+92
|\
| * Makes bubble and event info in search update tzErik2010-09-285-11/+92
| | | | | | | | | | | | | | | | | | | | Also fix for b/3044748 by moving rebuilding of views into onResume if we were notified of a change while paused. Also discovered that if search activity refreshes with a single event earlier than today it doesn't requery correctly and fails to expand to the event. Change-Id: Id55fc8b0effe05bf35f2c4ebd71d70826784174b
* | Add home tz support to day viewErik2010-09-281-4/+18
|/ | | | Change-Id: I59d1629ade69f355b51412b3086e9cc71dbcbd6d
* Add home tz support to Agenda ViewsErik2010-09-275-31/+105
| | | | | | | | This pushes the home tz checks and display code into Agenda Views, which are only used in search in HC. The Event Info that displays in the right pane has not been updated yet. Change-Id: Ib974d6bf877df880b716527db790141835b53c91
* b/2988876 Stop crash on orientation changeErik2010-09-245-184/+271
| | | | | | | | | | | EditEventFragment was triggering a fragment swap in onPause, which isn't supported. This fixes the behavior of Edit to handle moving the fragment around correctly. This change makes the behavior save the event when back is pressed and restore the event if the user goes home and returns. On orientation change changes get lost, however. Another change will be made to fix this. Change-Id: Iaef5eac6668a8e0ee4859f69e5a77ecb9a7a15a3
* Merge "Add support for home tz in month views"Erik2010-09-232-16/+60
|\
| * Add support for home tz in month viewsErik2010-09-222-16/+60
| | | | | | | | | | | | | | This adds support for home time zones to the two month views in the Calendar app. Change-Id: I41b202d7ef99738fe022e610c235ee2004fe357b
* | Merge "Manual merge of tz settings changes."Erik2010-09-233-100/+76
|\|
| * Manual merge of tz settings changes.Erik2010-09-223-100/+76
| | | | | | | | | | | | | | | | Merges changes I4ad92a73 and Ia7260f4d. This moves Calendar to using the hidden TimeZoneUtils API and properly displaying and updating the home time zone in settings. Change-Id: I51a80da0963ba5924a09e920f158cdc1c158fb2c
* | Revert "Add missing type."Daisuke Miyakawa2010-09-231-1/+1
| | | | | | | | This reverts commit 6b18e254762838fe8057588d686695f1f5904bf7.
* | Add missing type.Daisuke Miyakawa2010-09-231-1/+1
| | | | | | | | Change-Id: I3bbb33abd7a69f753ab56afefc0cfb5d0b07ac14
* | Let users go to account setup when no account.Daisuke Miyakawa2010-09-232-6/+17
| | | | | | | | | | | | | | The change Ic8575ca78fea81a27faab181acec4d550164b81b is needed. Bug: 2969457 Change-Id: I474f7a340d4086c06c32db5042c1f0753e7a9220
* | Merge "Make the app use new widget API."Daisuke Miyakawa2010-09-223-37/+51
|\ \
| * | Make the app use new widget API.Daisuke Miyakawa2010-09-223-37/+51
| |/ | | | | | | | | | | | | | | | | | | | | | | | | We have used setOnClickPendingIntent() but it is not recommended when the target view is a collection. Thus we use setPendingIntentTemplate() toward collections view (ListView this time), and just use setOnClickFillInIntent() toward each children. We still use setOnClickPendingIntent() toward non-collections. Bug: 3010626 Change-Id: I4f8fa47d00defd9bd91b5fc59983adf92e8c3eb7
* / Let EditEventFragment hides a software keyboardDaisuke Miyakawa2010-09-221-0/+13
|/ | | | | | | | Fragment doesn't take care of software keyboard even when it disappears, so we need to manually take care of it. Bug: 3028592 Change-Id: I7072b1932820575302f20bf64824df77b9367716
* Moves per calendar sync settings into SettingsErik2010-09-219-629/+415
| | | | | | | | This makes calendar sync settings show up on a per account basis in the Calendar Settings activity and also displays a message to the user if the account is not being auto-synced. Change-Id: I2326922f518ae3bc8d1db70ae5c1d5b07b251ca3
* Merge "Add "About calendar" preference shown on left pane."Daisuke Miyakawa2010-09-212-12/+44
|\
| * Add "About calendar" preference shown on left pane.Daisuke Miyakawa2010-09-172-12/+44
| | | | | | | | | | | | | | | | | | Also rename preferences.xml to general_preferences.xml for removing ambiguity. Bug: 3012097 Change-Id: I6c9e4e7d887439c12fee196b9e3990386e42c407
* | Make AllInOneActivity use SearchView API.Daisuke Miyakawa2010-09-173-12/+68
|/ | | | | Bug: 2996475 Change-Id: I00c79b50284cde71aacbe4899dd57cced0c8bb23
* Make settings screen support two pane mode.Daisuke Miyakawa2010-09-1613-68/+101
| | | | | | | | | | | | | | | | | | | 1) Rename CalendarPreferenceActivity to GeneralPreferences, and add CalendarSettingsActivity for top-level Activity. We should retain previous logs for CalendarPreferenceActivity, and we shouldn't call it "Activity" any more, as it is Fragment. I'm not sure whether the new "CalendarSettingsActivity" should be named so, or renaming it to "CalendarPreferenceActivity" to keep consistency around naming. 2) Add necessary xmls. Some of them are derived from Settings app, which already has new two pane structure, so refering its logic seems enough for now. Change-Id: I6a0b04bb824d06c2842cbd8127e2860c45350987
* resolved conflicts for merge of 26a935bc to masterErik2010-09-151-11/+19
|\ | | | | | | Change-Id: I946434c3dc5d66e113c6ad147c3b7afc59d2a96c
| * am e274e47b: b/2999394 Adds some logging for understanding bugErik2010-09-141-7/+15
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'e274e47b7073a350dec4924ac7c09ba4211cb06d' into gingerbread-plus-aosp * commit 'e274e47b7073a350dec4924ac7c09ba4211cb06d': b/2999394 Adds some logging for understanding bug
| | * b/2999394 Adds some logging for understanding bugErik2010-09-141-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | This speeds up TimezoneAdapter's creation slightly and also adds some logging so we can understand what the issue in b/2999394 is being caused by. Change-Id: Ie193da0767a07ae69226474e3a1094b0da40bd4c
| * | am e015df8d: Merge "Fixed notifications to show the user\'s selected ↵Michael Chan2010-09-131-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | timezone. Do not merge" into gingerbread Merge commit 'e015df8d7661daeaf0df3874110a3e2eb156ee07' into gingerbread-plus-aosp * commit 'e015df8d7661daeaf0df3874110a3e2eb156ee07': Fixed notifications to show the user's selected timezone. Do not merge
| | * Merge "Fixed notifications to show the user's selected timezone. Do not ↵Michael Chan2010-09-131-1/+1
| | |\ | | | | | | | | | | | | merge" into gingerbread
| | | * Fixed notifications to show the user's selected timezone. Do not mergeMichael Chan2010-09-131-1/+1
| | | | | | | | | | | | | | | | Change-Id: I8e1328af1b2f368b83902a8a2d3359011bf528cf
| * | | am 2adb0a5e: Adds gmt descriptors to tz settings list. Do not mergeErik2010-09-133-44/+60
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2adb0a5ee7e9ff4984e5e3198bc9f44710158418' into gingerbread-plus-aosp * commit '2adb0a5ee7e9ff4984e5e3198bc9f44710158418': Adds gmt descriptors to tz settings list. Do not merge
| | * | Adds gmt descriptors to tz settings list. Do not mergeErik2010-09-133-44/+60
| | |/ | | | | | | | | | | | | | | | | | | | | | This adds the GMT offset to the name of the timezones in the Calendar's time zone settings. Also fixes bug where gototoday would be off by several hours when in a home tz. Change-Id: I4ad92a734eb0c15671c4391586694e8e1539d27d
| * | am b4b8945a: Fix bug writing tz to db. Do not mergeErik2010-09-131-5/+5
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'b4b8945a5f33ab26db7e6827e47815e1c9ca8c47' into gingerbread-plus-aosp * commit 'b4b8945a5f33ab26db7e6827e47815e1c9ca8c47': Fix bug writing tz to db. Do not merge
| | * Fix bug writing tz to db. Do not mergeErik2010-09-131-5/+5
| | | | | | | | | | | | | | | | | | | | | Fixed a bug where the token was being incremented in the wrong order. Change-Id: I8dbfe16b81fc463dbd196dad1c359f7751e022aa
| * | am 63974da7: Integrate tz preferences with db. Do not mergeErik2010-09-101-5/+102
| |\| | | | | | | | | | | | | | | | | | | Merge commit '63974da72657fd9b9631a75dcc46eb9298c81013' into gingerbread-plus-aosp * commit '63974da72657fd9b9631a75dcc46eb9298c81013': Integrate tz preferences with db. Do not merge
| | * Integrate tz preferences with db. Do not mergeErik2010-09-101-5/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will now write and read the tz settings from the db correctly. Utils attempts to keep the preferences in sync with what's in the db, but currently does not protect against other apps writing to the db while we're running. This is not currently an issue as no one else uses these values and they are not public. Also adds Paris to the list of time zones (b/2992452). Change-Id: I6156121f0900001d166948a58ca0ef70a91b3314
| * | am fe3a17f2: Merge "Make edit event use the home tz. Do not merge" into ↵Erik2010-09-101-7/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'fe3a17f2bec714af6415ddd0c41b13f4fa47775f' into gingerbread-plus-aosp * commit 'fe3a17f2bec714af6415ddd0c41b13f4fa47775f': Make edit event use the home tz. Do not merge
| | * Make edit event use the home tz. Do not mergeErik2010-09-101-7/+8
| | | | | | | | | | | | Change-Id: Ic6000d3c47b5ed6ec24cd19ba0c078f7e4d8f793
| * | am e0f6a5cb: **DO NOT MERGE**Updates day/week/month view to use home tzErik2010-09-105-44/+162
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'e0f6a5cb8640e2d5da914da8d12bd0a5bd852e30' into gingerbread-plus-aosp * commit 'e0f6a5cb8640e2d5da914da8d12bd0a5bd852e30': **DO NOT MERGE**Updates day/week/month view to use home tz
| | * **DO NOT MERGE**Updates day/week/month view to use home tzErik2010-09-105-44/+162
| | | | | | | | | | | | Change-Id: I19baf0658ffbb3635714c6476b4a951f40e14563
| * | am 03d596e8: **DO NOT MERGE** Adds shorthand tz to settings summaryErik2010-09-101-4/+24
| |\| | | | | | | | | | | | | | | | | | | Merge commit '03d596e8e2c34bcb1a56205360480d64daa27901' into gingerbread-plus-aosp * commit '03d596e8e2c34bcb1a56205360480d64daa27901': **DO NOT MERGE** Adds shorthand tz to settings summary
| | * **DO NOT MERGE** Adds shorthand tz to settings summaryErik2010-09-101-4/+24
| | | | | | | | | | | | | | | | | | | | | Adds a shorthand version of the time zone to the Home time zone setting's summary. Change-Id: Ie1acc6d5d12bbaadd0c9729454f9d729871056cc
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 03:33:44 +0000