| c8db322de49a1da17c87a0c9ae6de018d3503e62 |
15-Jun-2016 |
Leszek Ślażyński <lslazynski@google.com> |
Merge \"CalendarProvider2: log failures to get the cached calling package.\" into nyc-dev
am: bcc65b8d27
Change-Id: I738a86b17cef357e6ac8de2709942ef465ff7691
|
| b0fd535180e6c1ce020022fcf3d8ab0ddfe9ee98 |
15-Jun-2016 |
Leszek layski <lslazynski@google.com> |
SQLiteContentProvider: log failures to get the calling package.
am: 69bc134573
Change-Id: I043351d569a47a37c988a26e44df3a2c65139715
|
| bcc65b8d27454f460902a15d25524925fc1f1893 |
14-Jun-2016 |
Leszek Ślażyński <lslazynski@google.com> |
Merge "CalendarProvider2: log failures to get the cached calling package." into nyc-dev
|
| 69bc134573749242032eb3c6a472c82a61b51413 |
13-Jun-2016 |
Leszek Ślażyński <lslazynski@google.com> |
SQLiteContentProvider: log failures to get the calling package.
Bug: 29321239
rc/com/android/providers/calendar/SQLiteContentProvider.java
|
| 254be6e254814a3e476e984463e20f0bfd7f7768 |
13-Jun-2016 |
Leszek Ślażyński <lslazynski@google.com> |
CalendarProvider2: log failures to get the cached calling package.
Throttle to once per thread, as this can be called many times in a batch for example.
Bug: 29321239
rc/com/android/providers/calendar/CalendarProvider2.java
|
| e62f92eb5c181be7c7c3d6d025ee06df4f291f26 |
31-May-2016 |
Tony Mak <tonymak@google.com> |
Remove SyncCalendarTest
am: d4d2fa8925
* commit 'd4d2fa8925829d9859782c769797e0dc2aa44473':
Remove SyncCalendarTest
Change-Id: Ie6ef6d27d36ed080111353114b61fb8e29ccb5e7
|
| d4d2fa8925829d9859782c769797e0dc2aa44473 |
31-May-2016 |
Tony Mak <tonymak@google.com> |
Remove SyncCalendarTest
We have CRUD test in CalendarProvider2Test.java.
This test case is to test whether the sync adapter work after the CRUD
operation. Tests should not be in here and should rather in
CalendarSyncAdapter test project. And CalendarSyncAdapter has its own
testing already and they are far more robust than what we have here.
Also, it requires the testing device to have a google account
which is actually not make sense in CalendarProvider test project.
This is the final piece that to make all tests in CalendarProvider test
project all pass. I will add the test project to continuous integartion.
Bug: 21689286
Change-Id: I61668f43b93cf8f98c02390eb16e709736affe82
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
ests/src/com/android/providers/calendar/SyncCalendarTest.java
|
| b6e750ef4d9f8c205a92f1358bb7e9801ab3456f |
19-Apr-2016 |
Narayan Kamath <narayan@google.com> |
Tidy up uses of Integer.valueOf.
am: a636a75
* commit 'a636a75adaa6e56f9e6b0e6605d33db414980c26':
Tidy up uses of Integer.valueOf.
Change-Id: I961818edcd14c6a247281af91d1821f5a8111320
|
| a636a75adaa6e56f9e6b0e6605d33db414980c26 |
19-Apr-2016 |
Narayan Kamath <narayan@google.com> |
Tidy up uses of Integer.valueOf.
Use parseInt when the result is assigned to an int. Allocates fewer
objects.
bug: 28078871
Change-Id: Ibe942226a0945e06f80136cea842890b703fd228
rc/com/android/providers/calendar/CalendarProvider2.java
|
| ff2dd5079c2da194f1d33380073656989ed8950d |
06-Apr-2016 |
Sebastien Hertz <shertz@google.com> |
Update code coverage filter
Bug: 28014424
(cherry picked from commit 23af0ab8aedf2298c469488f21fb28dde0b06971)
Change-Id: If079398abc6cbc875a8b824cbbbe07ea284406aa
ndroid.mk
|
| b1a3171dcc3b653654ba29c3e76a0dcca1241144 |
31-Mar-2016 |
Ricky Wai <rickywai@google.com> |
Fix Calendar is closed issue
CalendarDatabaseHelper instance should not be closed,
as it is shared across all code in CalendarProvider.
Bug: 27937880
Change-Id: I347023b9eadd559f93b2684b44a984c9daf81b34
rc/com/android/providers/calendar/CalendarUpgradeReceiver.java
|
| 59bf124a4ff25274075024341c459458a71d15a6 |
02-Feb-2016 |
Tony Mak <tonymak@google.com> |
GET_ACCOUNTS_PRIVILEGED is needed starting from NYC to list accounts
BUG=26913648
Change-Id: I997dc0375841e5e4ddabb1bdc6b1a18b830ce77c
ndroidManifest.xml
|
| 4f3665e629a7adfb733c0aca7d814527455eb721 |
04-Nov-2015 |
Dianne Hackborn <hackbod@google.com> |
Work on issue #25467052: System lagged out
am: 9b2d8e17e1
* commit '9b2d8e17e12557251a8dd7ede3f455c5fb40d1b4':
Work on issue #25467052: System lagged out
|
| 9b2d8e17e12557251a8dd7ede3f455c5fb40d1b4 |
04-Nov-2015 |
Dianne Hackborn <hackbod@google.com> |
Work on issue #25467052: System lagged out
Use REPLACE_PENDING when sending change broadcasts for the calendar
provider, so they don't cause backup in the queue.
Change-Id: Iab92c4a48a3e1ff085246e5ebc16fefae927133b
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 5bbd1b083957c44434a2528ea8cecaab04372880 |
11-Sep-2015 |
Tony Mak <tonymak@google.com> |
Add calendar-common dependency to CalendarProviderTests
It fixes ICalendarTest and RecurrenceSetTest.
Bug: 21689286
Change-Id: I9d8f444c7a21ca102f32677dbe5eac1092604790
ests/Android.mk
|
| 350bdf916ba93f0318a5c3b0cbd2c9794c748c80 |
17-Jul-2015 |
Tony Mak <tonymak@google.com> |
Turn on verbose logging to debug flaky test cases
We have some flaky test cases about recurrent event that fail sometime in
nexus9, turn on DEBUG_INSTANCES flag for more logging.
ag/729934 turn on verbose logging when running cts.
Bug: 22449592
Change-Id: I728a07fa41251a92aa3d786932dddf7cfbc433df
rc/com/android/providers/calendar/CalendarProvider2.java
|
| ea1b82d2ab660a15659258da19fabe19e5d4fbd5 |
16-Jul-2015 |
Tony Mak <tonymak@google.com> |
Fix calendar reminder notification is not shown in idle state
M introduce "doze" which prevents alarm goes off when devices is in idle
state.
The solution is to use setExactAndAllowWhileIdle, however,
there is a restriction that we can only have one such an alarm within 15
mins during dozing.
Before explaining the changes, here is the brief introduction how reminder
notification works.
CalendarProvider send EVENT_REMINDER broadcast to notify calendar app
to show notification.
It sets two alarms, one to send this broadcast and set one another to
schedule the next coming reminder.
The scheduler alarm goes off one minute after the reminder alarm.
Here are the changes:
1.Due to the 15 min restriction, the current architecture is not working.
This commit removes the scheduler alarm.
CalendarProvider now listens for the EVENT_REMINDER broadcast and
schedule the next reminder immediately.
2. When there is no reminder within 1 day, CalendarProvider will setup
an alarm on the next day to start the scheduler again.
This alarm needs to goes off in idle state. But due to the 15 mins
restriction, now the time is set to 15 mins earlier.
3. Also remove SCHEDULE broadcast which is basically same as the
ACTION_CHECK_NEXT_ALARM broadcast.
4. ag/720759 make sure the reminder alarm goes off during dozing.
Please notice that even with this commit, we can't have more than
one reminder notification within 15 minutes due to the restriction
mentioned above.
Bug: 22182280
Change-Id: I950dab5595a98a26370f2cd8decf0b32d9363591
ndroidManifest.xml
rc/com/android/providers/calendar/CalendarAlarmManager.java
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/CalendarProviderBroadcastReceiver.java
rc/com/android/providers/calendar/CalendarProviderIntentService.java
rc/com/android/providers/calendar/CalendarReceiver.java
ests/src/com/android/providers/calendar/CalendarProvider2ForTesting.java
|
| 08007188ce3af03ed13e9252febc9b22e1bfe953 |
19-May-2015 |
Keith Cheung <keithcheung@google.com> |
fix cursor.getColumnIndex(Calendars.IS_PRIMARY) always returns -1
Bug: 20921928
Change-Id: I8582eaba6031904d5c820203900f32d0f7ff32c0
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 53b6f267b6d37cc1cc88a5d960dd04ae5970e1ae |
08-Jun-2015 |
Tony Mak <tonymak@google.com> |
Merge "Fix crash when inserting reminder/attendee/extended property to a non-existent event" into mnc-dev
|
| 7d5a314146e64d45cd0981010f7b556897527d2e |
08-Jun-2015 |
Tony Mak <tonymak@google.com> |
Merge "Fix CalendarProvider2Test" into mnc-dev
|
| 503a798e5f76ecce75607277292bd9a326ba79ec |
08-Jun-2015 |
Tony Mak <tonymak@google.com> |
Fix crash when inserting reminder/attendee/extended property to a non-existent event
The problem is when inserting reminder/attendee/extended property, the code assumes the event it belongs to exists.
However, it may not be true in some edge cases.
For example, user is on the event edit page, while the event is being deleted in server at this moment.
Add checking to confirm the event does exists before having the insert logic.
As all logics in insert is run within a single transaction, we can be assured that the event does exist throughout the transaction.
Bug: b2/13287671
Change-Id: I655720c67ab3176d52759c43032682874aa3eb8b
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| ea28dfc327c87b24855f7abd9a48ba9a1b3f43f5 |
08-Jun-2015 |
Tony Mak <tonymak@google.com> |
Fix CalendarProvider2Test
1. Add authority into ProviderInfo
2. Add more features we needed in IsolatedContext
3. testInsertOriginalTimezoneInExtProperties is removed as we dun have this extended property anymore
4. Fix bug in instance search due to wrong order of selection args
5. Fix bug that dirty is not marked to 1 when attendee of event is deleted
Bug: 20715117
Change-Id: I494348742491eedf99355b44378d75e637b1e3c7
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 452385e795333ef5b7560d89f2a54e681c93dc31 |
22-Apr-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: Icde8e270f167fcbc20eeb0ab050fb0863182e352
Auto-generated-cl: translation import
es/values-gu-rIN/strings.xml
|
| b848d86cc7ed11b6f44075b44725806a8603e9ab |
02-Apr-2015 |
Alex Klyubin <klyubin@google.com> |
CalendarProvider does not use cleartext network traffic.
This declares to the platform and tools that this provider does not
use cleartext network traffic. The platform and tools will be blocking
(on best effort basis) attempts to use such traffic by this app.
For example, attempts to use HTTP (rather than HTTPS) will be blocked.
Bug: 19215516
Change-Id: I7c85b58275643cafc9e689161d511dac800f2d97
ndroidManifest.xml
|
| 6a16756da4d793f5de6f71b75ced79fc6c27ae04 |
22-Mar-2015 |
Qiwen Zhao <zhao@google.com> |
am 70936efe: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
* commit '70936efe38d456e827c11f9bbd98845677ae85a9':
|
| ee89449bb63da458f5d2028b6a053461622b0472 |
21-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I23abbb9aa328141fd53655b1a0616f480ffb9444
Auto-generated-cl: translation import
es/values-en-rAU/strings.xml
|
| 70936efe38d456e827c11f9bbd98845677ae85a9 |
21-Mar-2015 |
Qiwen Zhao <zhao@google.com> |
reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
|
| 8d1c84f2be265e595b762b0be1b74e70dcfc99ff |
21-Mar-2015 |
Baligh Uddin <baligh@google.com> |
am 019c2e1d: (-s ours) am 80976af5: (-s ours) am 3f7d0cce: (-s ours) Import translations. DO NOT MERGE
* commit '019c2e1d8fa7a317c67b07eff73d90d49e564f18':
|
| 52df2bded80d768b8f5c449a508c5813b9197fb4 |
21-Mar-2015 |
Baligh Uddin <baligh@google.com> |
am e6897552: (-s ours) am 7f436dee: (-s ours) am ab9a0774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'e6897552c2f7e79660cffce68912b046aaad40bc':
|
| f23bf2520e7642f6c3ac193bb2099fddcb2c8f96 |
21-Mar-2015 |
Baligh Uddin <baligh@google.com> |
am e6bd661d: (-s ours) am 49d0988d: (-s ours) am f4662dd0: (-s ours) am 51b66a98: (-s ours) am 4808a434: (-s ours) Import translations. DO NOT MERGE
* commit 'e6bd661d739f7efb2f23ec8f4068db1be4efe3da':
|
| 43640a86533593f11e5cd7538bdab62d39e949be |
11-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I895499d65185c495a93886f93105cb702aec1dd6
Auto-generated-cl: translation import
es/values-ar-rXB/strings.xml
|
| deadbccce6fb406bf5af1be5f6ddfbf3e74bf2e5 |
09-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ic8cb715f7fed9107548c9d0a7ba5137b4964a5c6
Auto-generated-cl: translation import
es/values-hy-rAM/strings.xml
|
| ecd3edaaee73137f5806650f8b49b59dba098b34 |
27-Feb-2015 |
Geoff Mendal <mendal@google.com> |
am d2d82f31: (-s ours) am c407de23: (-s ours) Import translations. DO NOT MERGE
* commit 'd2d82f312f6c25c7ed5ccd6e853cac606bfb04fd':
Import translations. DO NOT MERGE
|
| d2d82f312f6c25c7ed5ccd6e853cac606bfb04fd |
27-Feb-2015 |
Geoff Mendal <mendal@google.com> |
am c407de23: (-s ours) Import translations. DO NOT MERGE
* commit 'c407de23e8ca46e84448631169be368694cc9d05':
Import translations. DO NOT MERGE
|
| c407de23e8ca46e84448631169be368694cc9d05 |
26-Feb-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: Icba5388e598c136726d3a4b9feaa130ecb7d03e7
Auto-generated-cl: translation import
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-my-rMM/strings.xml
es/values-nl/strings.xml
es/values-pt/strings.xml
es/values-th/strings.xml
es/values-zh-rCN/strings.xml
es/values-zu/strings.xml
|
| 18b5e4f17fc6fb729d2c1828c9bcdef2172ff1da |
12-Feb-2015 |
Geoff Mendal <mendal@google.com> |
am ffab862f: (-s ours) am 614e584a: (-s ours) Import translations. DO NOT MERGE
* commit 'ffab862f25dffe3c9c9d688cc1eb9b936db10734':
Import translations. DO NOT MERGE
|
| ffab862f25dffe3c9c9d688cc1eb9b936db10734 |
12-Feb-2015 |
Geoff Mendal <mendal@google.com> |
am 614e584a: (-s ours) Import translations. DO NOT MERGE
* commit '614e584ac203e9268c6df636e08cd8e5b25465aa':
Import translations. DO NOT MERGE
|
| 614e584ac203e9268c6df636e08cd8e5b25465aa |
12-Feb-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: Id32f4a8bd5c6b6e94dc39c33ffc5c26d0a8b136b
Auto-generated-cl: translation import
es/values-fa/strings.xml
es/values-hi/strings.xml
es/values-iw/strings.xml
es/values-nl/strings.xml
es/values-pt/strings.xml
|
| 992393481ba7e7af6cc4c626e1c660ed869148cd |
02-Feb-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ic9a879bcdafda0380d6a0cc72623419d38464b62
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar-rXB/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
| a48a040eaad1bc32d79b31d36fb68003f768ba6e |
30-Jan-2015 |
Dianne Hackborn <hackbod@google.com> |
No longer need to take care of pre boot msg.
Change-Id: I877c569a0e134cd501d7b95518d5c15a7e4489f2
es/values/strings.xml
rc/com/android/providers/calendar/CalendarUpgradeReceiver.java
|
| 8f1d1b4f9b34abb393b8dcae2b6d1dc6f35bb8df |
22-Dec-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I0f4c2abd8ec69fc093a270d401cff6200eb0c384
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
|
| ee147a50c48a76c6a0d7deed4e6a5afadc96b5c5 |
12-Dec-2014 |
Sam Blitzstein <sblitz@google.com> |
am 109d19cc: am 2dc73a40: am 96d67800: Before the first call to clearCallingIdentity, cache the calling package.
* commit '109d19ccd3b6251e242c40cb560d3b2385472148':
Before the first call to clearCallingIdentity, cache the calling package.
|
| 109d19ccd3b6251e242c40cb560d3b2385472148 |
12-Dec-2014 |
Sam Blitzstein <sblitz@google.com> |
am 2dc73a40: am 96d67800: Before the first call to clearCallingIdentity, cache the calling package.
* commit '2dc73a40911dfc959c340d084232cc2dca621685':
Before the first call to clearCallingIdentity, cache the calling package.
|
| 2dc73a40911dfc959c340d084232cc2dca621685 |
11-Dec-2014 |
Sam Blitzstein <sblitz@google.com> |
am 96d67800: Before the first call to clearCallingIdentity, cache the calling package.
* commit '96d67800c827efb5c08adaa32e221aaae53d02a4':
Before the first call to clearCallingIdentity, cache the calling package.
|
| 96d67800c827efb5c08adaa32e221aaae53d02a4 |
04-Dec-2014 |
Sam Blitzstein <sblitz@google.com> |
Before the first call to clearCallingIdentity, cache the calling package.
Then it will be saved as a mutator when the dirty bit is set.
This may be accessed by multiple threads, so the data is cached in ThreadLocal.
Also track the calling Uid, and clear the cached package when the tracked Uid
is restored.
Bug: 18421411
Change-Id: I4597bd4169636c3988d72ddde51578a02af193ea
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/SQLiteContentProvider.java
|
| 168e02aff896aecd689d44c3118186c11a0420a8 |
08-Dec-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I44a61c683d3780730a1ae14f584e5cde72342cf4
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
|
| dd581c1b8c21db346b0fcef93d20fff2921a24e7 |
24-Nov-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I9c7ab9a4ce4a4cf6ad91aea05ad71c34b8c8e3de
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
|
| 5776091e80aeb90349843327b275702c2af89cee |
19-Nov-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I6a294006a63cf04242eca4dbef093bb624460c78
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
|
| b80ad09ea8fc9be635477aadf8c1466aaa8b1a71 |
10-Nov-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I4a6b93c7183c250fb9e5137353e8991c6b7f9f7c
Auto-generated-cl: translation import
es/values-fa/strings.xml
|
| ca099b2519701adf37679f00d1d3cef3fab5f39e |
31-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 18ab4870: (-s ours) am a0960e75: (-s ours) Import translations. DO NOT MERGE
* commit '18ab48703c61071328a149eaff328e878e73b370':
Import translations. DO NOT MERGE
|
| 18ab48703c61071328a149eaff328e878e73b370 |
31-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am a0960e75: (-s ours) Import translations. DO NOT MERGE
* commit 'a0960e75e946c6412452e6c91ac0d22933c00fd5':
Import translations. DO NOT MERGE
|
| a0960e75e946c6412452e6c91ac0d22933c00fd5 |
30-Oct-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I95aa33eb9f025c530a9d28dbae3994747d29e94e
Auto-generated-cl: translation import
es/values-eu-rES/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-my-rMM/strings.xml
es/values-nl/strings.xml
es/values-pt/strings.xml
es/values-th/strings.xml
es/values-zh-rCN/strings.xml
es/values-zu/strings.xml
|
| cdf76acd4674d1f8dc2c27cde3328752f6fb1ad2 |
29-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am ea50f5a1: (-s ours) am 566aff4d: (-s ours) am b78250d0: (-s ours) Import translations. DO NOT MERGE
* commit 'ea50f5a10baec724a06233cc05acb6d1483b0f4c':
|
| e34e4e30d0eb21cf94f7a4d9817c4771e1590321 |
29-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am bd9cbbdd: (-s ours) am 59b1ec53: (-s ours) am 04631ba7: (-s ours) Import translations. DO NOT MERGE
* commit 'bd9cbbdd352c0a9b498f96b0633ae9e0724fbe4f':
|
| b12fafbb749d762544b08c10304859b95bb4f1bc |
29-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am a627f642: (-s ours) am 6e5e3e5a: (-s ours) am 2aea2248: (-s ours) am 62360ec4: (-s ours) Import translations. DO NOT MERGE
* commit 'a627f6426f0fde0336b3454dcd04bc5187e2252f':
|
| ea50f5a10baec724a06233cc05acb6d1483b0f4c |
29-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 566aff4d: (-s ours) am b78250d0: (-s ours) Import translations. DO NOT MERGE
* commit '566aff4d55aac8ff4b7711e4d72ed99e7e83b526':
|
| bd9cbbdd352c0a9b498f96b0633ae9e0724fbe4f |
29-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 59b1ec53: (-s ours) am 04631ba7: (-s ours) Import translations. DO NOT MERGE
* commit '59b1ec5304cb2a791fa94be5081c87ab4f686f53':
|
| a627f6426f0fde0336b3454dcd04bc5187e2252f |
29-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 6e5e3e5a: (-s ours) am 2aea2248: (-s ours) am 62360ec4: (-s ours) Import translations. DO NOT MERGE
* commit '6e5e3e5ab1bab262b7af03b0897a9ce5d2b55a67':
|
| 2e5dfffda77e18df700707c836d8ef60255fc1b7 |
20-Oct-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I112a3b5b41354be01f2a203c2ec4e2fcfb0111d0
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
|
| 88822e2a1173653f5ce8ba04ace4715ab0c69b98 |
19-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 6cc16328: (-s ours) am 139852ae: (-s ours) am d96b2bcc: (-s ours) am fe772b67: (-s ours) am b78250d0: (-s ours) Import translations. DO NOT MERGE
* commit '6cc163288e6cf213ca4b29a8afe8def0c0a9f11d':
Import translations. DO NOT MERGE
|
| 6cc163288e6cf213ca4b29a8afe8def0c0a9f11d |
19-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 139852ae: (-s ours) am d96b2bcc: (-s ours) am fe772b67: (-s ours) am b78250d0: (-s ours) Import translations. DO NOT MERGE
* commit '139852aeb5a8aa70c042ef0dfc908ab8a71ed913':
Import translations. DO NOT MERGE
|
| 139852aeb5a8aa70c042ef0dfc908ab8a71ed913 |
19-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am d96b2bcc: (-s ours) am fe772b67: (-s ours) am b78250d0: (-s ours) Import translations. DO NOT MERGE
* commit 'd96b2bcc2b675b6e8eae54af31b51325ec73ce0a':
Import translations. DO NOT MERGE
|
| d96b2bcc2b675b6e8eae54af31b51325ec73ce0a |
19-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am fe772b67: (-s ours) am b78250d0: (-s ours) Import translations. DO NOT MERGE
* commit 'fe772b67196a6d81965fe3574e1fb4786c51182a':
Import translations. DO NOT MERGE
|
| fe772b67196a6d81965fe3574e1fb4786c51182a |
19-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am b78250d0: (-s ours) Import translations. DO NOT MERGE
* commit 'b78250d067b12b97e4f0f32f0b5ee0f7f3fab48f':
Import translations. DO NOT MERGE
|
| 566aff4d55aac8ff4b7711e4d72ed99e7e83b526 |
19-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am b78250d0: (-s ours) Import translations. DO NOT MERGE
* commit 'b78250d067b12b97e4f0f32f0b5ee0f7f3fab48f':
Import translations. DO NOT MERGE
|
| b78250d067b12b97e4f0f32f0b5ee0f7f3fab48f |
19-Oct-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I7fb5ee957f8b1963543df5d40fd980f1f034e7cc
Auto-generated-cl: translation import
es/values-iw/strings.xml
es/values-nl/strings.xml
|
| 9773a13068b25dfb2e125002079caf8ee6cb6362 |
06-Oct-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: Iac8b1360a6f78d5efcf8451ce03b6fc135b6787b
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
|
| 69762d366c818df4e7bbc7597aae94f8cffca6db |
05-Oct-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I6c272b51e6eec7275668de99af14dd8978c8a761
Auto-generated-cl: translation import
es/values-nl/strings.xml
|
| ff8f1cbea89c22448827facd4605963afbd24498 |
01-Oct-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| f11cb4616d0a392678e15aa628c1a3fa3146b34f |
01-Oct-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I4fd24af38602c3f2cfbdbe0562013296a1975791
Auto-generated-cl: translation import
es/values-iw/strings.xml
es/values-nl/strings.xml
|
| c2868b4af747d9947f640cbd505301abe8b3ba2a |
30-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am a1e7348e: (-s ours) am 9191caf5: (-s ours) am dd6ddd79: (-s ours) am 6494d0b3: (-s ours) am 04631ba7: (-s ours) Import translations. DO NOT MERGE
* commit 'a1e7348e7ed3a553163f2778c005bdbb519397a6':
Import translations. DO NOT MERGE
|
| a1e7348e7ed3a553163f2778c005bdbb519397a6 |
30-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 9191caf5: (-s ours) am dd6ddd79: (-s ours) am 6494d0b3: (-s ours) am 04631ba7: (-s ours) Import translations. DO NOT MERGE
* commit '9191caf5cc4ca24b7b1f97d1708961acd8211dae':
Import translations. DO NOT MERGE
|
| 9191caf5cc4ca24b7b1f97d1708961acd8211dae |
30-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am dd6ddd79: (-s ours) am 6494d0b3: (-s ours) am 04631ba7: (-s ours) Import translations. DO NOT MERGE
* commit 'dd6ddd796d0220bab9801551bc5821478077eb56':
Import translations. DO NOT MERGE
|
| dd6ddd796d0220bab9801551bc5821478077eb56 |
30-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 6494d0b3: (-s ours) am 04631ba7: (-s ours) Import translations. DO NOT MERGE
* commit '6494d0b34eeb79bc569fbca273a19a242a1aec99':
Import translations. DO NOT MERGE
|
| 6494d0b34eeb79bc569fbca273a19a242a1aec99 |
30-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 04631ba7: (-s ours) Import translations. DO NOT MERGE
* commit '04631ba71e6ddacab0d4f0e0cbc5e6b8f914a522':
Import translations. DO NOT MERGE
|
| 59b1ec5304cb2a791fa94be5081c87ab4f686f53 |
29-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 04631ba7: (-s ours) Import translations. DO NOT MERGE
* commit '04631ba71e6ddacab0d4f0e0cbc5e6b8f914a522':
Import translations. DO NOT MERGE
|
| 04631ba71e6ddacab0d4f0e0cbc5e6b8f914a522 |
29-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ic7187bdf4dffe2fe50aedff6fd5f7fd560dfdf3e
Auto-generated-cl: translation import
es/values-pt/strings.xml
|
| 8b7b597b43baf35543a5da7227775cdf9377f4cb |
21-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I8e8eb509d74ee49b1a9ca137f8575cf358ea8247
Auto-generated-cl: translation import
es/values-pt/strings.xml
|
| d199e7abe0d1650297bdee41622382e3d68c39cc |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| 879518eeca324008b6dcd6e025e8ea3561b87474 |
19-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 83d8582d: (-s ours) am 2015e00f: (-s ours) am da0c7be9: (-s ours) am 9f2f570b: (-s ours) am 62360ec4: (-s ours) Import translations. DO NOT MERGE
* commit '83d8582dfd630112fe0faced7b9bcd4d1792634b':
|
| 55f17bc3108edc355233d5560ee6b1b52061f281 |
17-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I43afb362b77666ba616e7a16099906bbcac3cb0d
Auto-generated-cl: translation import
es/values-hi/strings.xml
|
| 83d8582dfd630112fe0faced7b9bcd4d1792634b |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 2015e00f: (-s ours) am da0c7be9: (-s ours) am 9f2f570b: (-s ours) am 62360ec4: (-s ours) Import translations. DO NOT MERGE
* commit '2015e00f9eeaa48dfef2e5876d1968afcdede191':
Import translations. DO NOT MERGE
|
| a05a859c29b4ef7da55cc54c8f32fa68d84b7da4 |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 6e5e3e5a: (-s ours) am 2aea2248: (-s ours) am 62360ec4: (-s ours) Import translations. DO NOT MERGE
* commit '6e5e3e5ab1bab262b7af03b0897a9ce5d2b55a67':
Import translations. DO NOT MERGE
|
| 6e5e3e5ab1bab262b7af03b0897a9ce5d2b55a67 |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 2aea2248: (-s ours) am 62360ec4: (-s ours) Import translations. DO NOT MERGE
* commit '2aea22487d252744ad50085cba233e7d63ff0e6a':
Import translations. DO NOT MERGE
|
| 2015e00f9eeaa48dfef2e5876d1968afcdede191 |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am da0c7be9: (-s ours) am 9f2f570b: (-s ours) am 62360ec4: (-s ours) Import translations. DO NOT MERGE
* commit 'da0c7be9598633919e3f9d603d11159c94bae2c3':
Import translations. DO NOT MERGE
|
| da0c7be9598633919e3f9d603d11159c94bae2c3 |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 9f2f570b: (-s ours) am 62360ec4: (-s ours) Import translations. DO NOT MERGE
* commit '9f2f570bba99b348a4ab5a3a4fbaef989795f0be':
Import translations. DO NOT MERGE
|
| 2aea22487d252744ad50085cba233e7d63ff0e6a |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 62360ec4: (-s ours) Import translations. DO NOT MERGE
* commit '62360ec44f71e9f5702ad310d24520e7f29e5384':
Import translations. DO NOT MERGE
|
| 9f2f570bba99b348a4ab5a3a4fbaef989795f0be |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 62360ec4: (-s ours) Import translations. DO NOT MERGE
* commit '62360ec44f71e9f5702ad310d24520e7f29e5384':
Import translations. DO NOT MERGE
|
| 62360ec44f71e9f5702ad310d24520e7f29e5384 |
15-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I32f1ab75c3020b6103289b2a3d9d60bd14f7172f
Auto-generated-cl: translation import
es/values-hi/strings.xml
|
| a632530b807fce9271d5618cdaa0a8ed57853b42 |
27-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I929429e94965bf7e1774e6ad390c637f677b2227
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-ja/strings.xml
es/values-my-rMM/strings.xml
|
| 73f276b03d3a1f9c6b668b69d5855e5e3e2cf263 |
25-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 019c2e1d: (-s ours) am 80976af5: (-s ours) am 3f7d0cce: (-s ours) Import translations. DO NOT MERGE
* commit '019c2e1d8fa7a317c67b07eff73d90d49e564f18':
Import translations. DO NOT MERGE
|
| 019c2e1d8fa7a317c67b07eff73d90d49e564f18 |
25-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 80976af5: (-s ours) am 3f7d0cce: (-s ours) Import translations. DO NOT MERGE
* commit '80976af554fbced573dde2be6c4a64095e851a2d':
Import translations. DO NOT MERGE
|
| 80976af554fbced573dde2be6c4a64095e851a2d |
25-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 3f7d0cce: (-s ours) Import translations. DO NOT MERGE
* commit '3f7d0cce82795aae53380c5f757f42a4fbeeb638':
Import translations. DO NOT MERGE
|
| 3f7d0cce82795aae53380c5f757f42a4fbeeb638 |
24-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ib93e461aeb31e18d00c78e675c351ce74a472575
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-ja/strings.xml
es/values-my-rMM/strings.xml
es/values-zh-rCN/strings.xml
es/values-zu/strings.xml
|
| 17fa97163625328e9c2d94106953aaea846a378b |
19-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I78811c86c3ac26e271d729fdc971879d9f11c439
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
es/values-zh-rCN/strings.xml
es/values-zu/strings.xml
|
| a912698a5c1c2b897307d28f69ce3ebcb545f0df |
17-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am e6897552: (-s ours) am 7f436dee: (-s ours) am ab9a0774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'e6897552c2f7e79660cffce68912b046aaad40bc':
Import translations. DO NOT MERGE
|
| e6897552c2f7e79660cffce68912b046aaad40bc |
17-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 7f436dee: (-s ours) am ab9a0774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '7f436dee8d1097671332cc1bf7fa178092de09b5':
Import translations. DO NOT MERGE
|
| 7f436dee8d1097671332cc1bf7fa178092de09b5 |
17-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am ab9a0774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'ab9a0774c889170dc6047f56b2d49706f01b59c1':
Import translations. DO NOT MERGE
|
| 642c5c4f9537d55afb88fbc131e6f0522f4ac6cc |
17-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am e6bd661d: (-s ours) am 49d0988d: (-s ours) am f4662dd0: (-s ours) am 51b66a98: (-s ours) am 4808a434: (-s ours) Import translations. DO NOT MERGE
* commit 'e6bd661d739f7efb2f23ec8f4068db1be4efe3da':
Import translations. DO NOT MERGE
|
| e6bd661d739f7efb2f23ec8f4068db1be4efe3da |
17-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 49d0988d: (-s ours) am f4662dd0: (-s ours) am 51b66a98: (-s ours) am 4808a434: (-s ours) Import translations. DO NOT MERGE
* commit '49d0988d773e7bec791e98c9d0333d0db5c17fdf':
Import translations. DO NOT MERGE
|
| 49d0988d773e7bec791e98c9d0333d0db5c17fdf |
17-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am f4662dd0: (-s ours) am 51b66a98: (-s ours) am 4808a434: (-s ours) Import translations. DO NOT MERGE
* commit 'f4662dd01cd186142679d8760240b1c1f42fa016':
Import translations. DO NOT MERGE
|
| f4662dd01cd186142679d8760240b1c1f42fa016 |
17-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 51b66a98: (-s ours) am 4808a434: (-s ours) Import translations. DO NOT MERGE
* commit '51b66a98160f652467001360adfe5756bbb74069':
Import translations. DO NOT MERGE
|
| ab9a0774c889170dc6047f56b2d49706f01b59c1 |
17-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into lmp-dev
|
| 4f3227285099b801a9472a02aec9a747ecb884f2 |
16-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ic26dcaf57ffeabe7780d37f40c8921ed4de39739
Auto-generated-cl: translation import
es/values-eu-rES/strings.xml
es/values-gl-rES/strings.xml
es/values-my-rMM/strings.xml
es/values-th/strings.xml
|
| 51b66a98160f652467001360adfe5756bbb74069 |
16-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 4808a434: (-s ours) Import translations. DO NOT MERGE
* commit '4808a43443539b4ba9d93fc09344a0c7ff617c29':
Import translations. DO NOT MERGE
|
| 4808a43443539b4ba9d93fc09344a0c7ff617c29 |
16-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I9cffa64bca0205123a0ddb87d9fe244ad338d422
Auto-generated-cl: translation import
es/values-th/strings.xml
|
| b1b1ac074dff118b9d131b4178cef2fcb98220f8 |
12-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I18b60735b594775e85ed2ea9dbcc7f98a1d0a91b
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
|
| 06fa0df92c24c25c93a43f44b68f5d133482ca27 |
06-Aug-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ib755434ad98c00ca6bed5461be73f29bab944d8c
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
|
| 0ab307238107189b4717127b638e6c7dc9f988f1 |
30-Jul-2014 |
Jay Shrauner <shrauner@google.com> |
Fix stale db handle crash
Need to reacquire db handle before handling requests.
Fix NPEs when timezonetype isn't in the cache.
Bug:16559219
Change-Id: Ie037399aec91feb80312adf7c37d8d210b6aa544
rc/com/android/providers/calendar/CalendarAlarmManager.java
rc/com/android/providers/calendar/CalendarInstancesHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| e078ed36a8343fe9c2592bb710d421db17b61c45 |
31-Jul-2014 |
Geoff Mendal <mendal@google.com> |
Merge "Import translations. DO NOT MERGE"
|
| ff84b0704274d298f1f34ccd2d9250b6ba0f41c3 |
31-Jul-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I9562f15c38b9af0e5a2c659bf7a28b978f7ffcd0
Auto-generated-cl: translation import
es/values-eu-rES/strings.xml
|
| ea79c95f242d908d93eea8aadc0de213a6c4d227 |
31-Jul-2014 |
Jay Shrauner <shrauner@google.com> |
am 0ab30723: Fix stale db handle crash
* commit '0ab307238107189b4717127b638e6c7dc9f988f1':
Fix stale db handle crash
|
| 368764277084224fd5fd80705abb01dcd91fc34e |
30-Jul-2014 |
Jay Shrauner <shrauner@google.com> |
am 9e49d121: Disable backup
* commit '9e49d121ea2491aee140a350630ce21ce2c2e89e':
Disable backup
|
| 9e49d121ea2491aee140a350630ce21ce2c2e89e |
30-Jul-2014 |
Jay Shrauner <shrauner@google.com> |
Disable backup
Disable all backup
Bug:16676574
Change-Id: I76b4bd19495f4eb3102ca8c7b47e1959ac8ba00d
ndroidManifest.xml
|
| b3e4f8edcbed476332b7844eeaa1572dab0f06bb |
24-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I79daff2687f60efe03e3dcbd0ae004ecaa19f58d
Auto-generated-cl: translation import
es/values-eu-rES/strings.xml
es/values-gl-rES/strings.xml
es/values-th/strings.xml
|
| 14e5ec601c4360467631730a36cd90cf552a4a9e |
21-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 1f98ca24: (-s ours) Remove deprecated locales - DO NOT MERGE
* commit '1f98ca245c9d99a65bd6954bbc05b082f6846248':
Remove deprecated locales - DO NOT MERGE
|
| 1f98ca245c9d99a65bd6954bbc05b082f6846248 |
19-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Remove deprecated locales - DO NOT MERGE
Change-Id: Id2fc950d39124dc64c1acc119567884e14c501a7
es/values-az/strings.xml
es/values-bn-rWB/strings.xml
es/values-kn-rKA/strings.xml
es/values-ml-rKL/strings.xml
es/values-mr-rMH/strings.xml
es/values-ne/strings.xml
es/values-si/strings.xml
es/values-ta-rTN/strings.xml
es/values-te-rAP/strings.xml
|
| d78926ce170f7eca9ff1c3f360c0e90a26d432f8 |
18-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Remove deprecated locales
Change-Id: Ibdc4087e99527db523781b028ddf245c5cdde437
es/values-az/strings.xml
es/values-ne/strings.xml
es/values-si/strings.xml
|
| ce42c13733afd34f5e96b107db9e06b62c744d2d |
18-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Remove deprecated locales
Change-Id: Ib438c4a745cd61a65946c680a0bef861f841c534
es/values-bn-rWB/strings.xml
es/values-kn-rKA/strings.xml
es/values-ml-rKL/strings.xml
es/values-mr-rMH/strings.xml
es/values-ta-rTN/strings.xml
es/values-te-rAP/strings.xml
|
| 0b8dd1b4b4ab3e9ee92947d1c881f4c22bd66982 |
07-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am ed5a71d9: (-s ours) am 01bf06f7: (-s ours) am ba81470c: (-s ours) am 072d2c74: (-s ours) Import translations. DO NOT MERGE
* commit 'ed5a71d947191ce822ba7d3610d5d8a0e508f90f':
Import translations. DO NOT MERGE
|
| ed5a71d947191ce822ba7d3610d5d8a0e508f90f |
07-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 01bf06f7: (-s ours) am ba81470c: (-s ours) am 072d2c74: (-s ours) Import translations. DO NOT MERGE
* commit '01bf06f77bb40f9da2e656ee2469721c1da06265':
Import translations. DO NOT MERGE
|
| 01bf06f77bb40f9da2e656ee2469721c1da06265 |
07-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am ba81470c: (-s ours) am 072d2c74: (-s ours) Import translations. DO NOT MERGE
* commit 'ba81470c6ada0394517ab2d80edfed20afdc1af7':
Import translations. DO NOT MERGE
|
| e7e5bdb85ce75dc76abf07b7295d9e45762aa6e0 |
07-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am fbea9637: (-s ours) am 9ce3a1f1: (-s ours) Import translations. DO NOT MERGE
* commit 'fbea96377747e62cf854475f856d68efb5825758':
Import translations. DO NOT MERGE
|
| fbea96377747e62cf854475f856d68efb5825758 |
07-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 9ce3a1f1: (-s ours) Import translations. DO NOT MERGE
* commit '9ce3a1f1c1ef8d53a48b8ebb0a3b6182103c3e52':
Import translations. DO NOT MERGE
|
| ba81470c6ada0394517ab2d80edfed20afdc1af7 |
07-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 072d2c74: (-s ours) Import translations. DO NOT MERGE
* commit '072d2c74a13a3632025b1a65030e6b4fad8f195b':
Import translations. DO NOT MERGE
|
| e0dec0a1548943d4f17d0c4e3ac37b23280030df |
07-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ib335cf9448cf44da974687e8823aaa7359273826
Auto-generated-cl: translation import
es/values-bn-rBD/strings.xml
es/values-kn-rIN/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
|
| 9ce3a1f1c1ef8d53a48b8ebb0a3b6182103c3e52 |
07-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I24b6fe94557639639a1b975860681537e4a991af
Auto-generated-cl: translation import
es/values-th/strings.xml
|
| 072d2c74a13a3632025b1a65030e6b4fad8f195b |
07-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I2124b6ae5d623412be6219cc2a47892d2b763df2
Auto-generated-cl: translation import
es/values-ar-rXB/strings.xml
es/values-ar/strings.xml
es/values-fa/strings.xml
es/values-hi/strings.xml
es/values-iw/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
|
| eced31c0514b58dbfd952562f1c6c2d95b9bc148 |
30-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I345ab8ee0e4f97f895f15e70ff206c4877de968b
Auto-generated-cl: translation import
es/values-bn-rWB/strings.xml
es/values-is-rIS/strings.xml
es/values-kn-rKA/strings.xml
es/values-ml-rKL/strings.xml
es/values-mr-rMH/strings.xml
es/values-ta-rTN/strings.xml
es/values-te-rAP/strings.xml
|
| 89f036701acb5423029412bd94868514000d8a6c |
26-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 9a2425a4: (-s ours) am a52ec0f5: (-s ours) Import translations. DO NOT MERGE
* commit '9a2425a47db97a63a8e33f9a3a8668e4796f395b':
Import translations. DO NOT MERGE
|
| 9a2425a47db97a63a8e33f9a3a8668e4796f395b |
26-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am a52ec0f5: (-s ours) Import translations. DO NOT MERGE
* commit 'a52ec0f52864473f0e9cb9cbba84bc5755e86adb':
Import translations. DO NOT MERGE
|
| a52ec0f52864473f0e9cb9cbba84bc5755e86adb |
25-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I117b8fae5e3060735bd71dbf486a6a41d317f1ba
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-sr/strings.xml
|
| 9ee04733672611f89fb5f53b01f6cdc1b85c06d2 |
19-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Id8c40378803acff0b2ef764962d9d4f025f460fe
Auto-generated-cl: translation import
es/values-hi/strings.xml
|
| 0d14c2b47cd150967c614b39449822558a59f0c0 |
10-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ia5e0d0883d99eb2c50cc7b0b44119153776024e2
Auto-generated-cl: translation import
es/values-sr/strings.xml
|
| 0a76feb844adedb95d0c2ca249f2b6165f9b3b02 |
22-May-2014 |
Baligh Uddin <baligh@google.com> |
am f776b4a6: (-s ours) am 06514279: (-s ours) Import translations. DO NOT MERGE
* commit 'f776b4a6b74850d0b3b1284f45930818f675fb06':
Import translations. DO NOT MERGE
|
| f776b4a6b74850d0b3b1284f45930818f675fb06 |
22-May-2014 |
Baligh Uddin <baligh@google.com> |
am 06514279: (-s ours) Import translations. DO NOT MERGE
* commit '06514279999ca80a9ce1c5728e2f41c71e69eb16':
Import translations. DO NOT MERGE
|
| 06514279999ca80a9ce1c5728e2f41c71e69eb16 |
22-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: If04bea3f4733fa1d1993a2d91ab93fe7dda823df
Auto-generated-cl: translation import
es/values-ar-rXB/strings.xml
|
| dceeec894c68e14d16c1ebe3a33a23e97c0f2489 |
06-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I8dbb7e075020dd253008d448ada9aee77cb698bf
Auto-generated-cl: translation import
es/values-ar-rXB/strings.xml
|
| ba9b99ccae5086b39f7b3772ef0690678d93b415 |
01-May-2014 |
Baligh Uddin <baligh@google.com> |
Revert "Import translations. DO NOT MERGE"
This reverts commit 4f81d0f29347f54af75aeeef3dcd4352389e8959.
Change-Id: I85b65ac79a70dfccfdd1dece75e367935ce1fef8
es/values-ar-rXB/strings.xml
|
| 4f81d0f29347f54af75aeeef3dcd4352389e8959 |
01-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ia28c16f71f9877f684597b26a357f4286d558a30
Auto-generated-cl: translation import
es/values-ar-rXB/strings.xml
|
| ac16d5ac26cf7993e0c66ef85c8c3ba38f1ac764 |
23-Apr-2014 |
Alexandra Gherghina <alexgherghina@google.com> |
Merge "Revert "Mark CalendarProvider as required for all profiles""
|
| d4931a051d1050094dbef23caf9d7cd6e554daf1 |
23-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 8a2055a9: (-s ours) am 0d95ae0f: (-s ours) Import translations. DO NOT MERGE
* commit '8a2055a95689b3845ebd2421751902730d5e23cd':
Import translations. DO NOT MERGE
|
| 8a2055a95689b3845ebd2421751902730d5e23cd |
23-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 0d95ae0f: (-s ours) Import translations. DO NOT MERGE
* commit '0d95ae0fda3f85f92be5786623e3d8eb3eae54f1':
Import translations. DO NOT MERGE
|
| 0d95ae0fda3f85f92be5786623e3d8eb3eae54f1 |
23-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Id349ff3a2bfa0c8a98c9ff8cd4297372a50efd30
Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-en-rIN/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fr-rCA/strings.xml
es/values-hi/strings.xml
es/values-hy-rAM/strings.xml
es/values-iw/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-lo-rLA/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-zh-rHK/strings.xml
|
| 50bdd67bf87b97e0d3f527285229c4c04509278d |
11-Apr-2014 |
Alexandra Gherghina <alexgherghina@google.com> |
Revert "Mark CalendarProvider as required for all profiles"
This reverts commit e26536f0a4074537633cc7b8b49a5f556aee045c.
We've switched to a whitelist approach.
Change-Id: Id960fac9319031cc4b552c503489e60ed8be8626
ndroidManifest.xml
|
| e26536f0a4074537633cc7b8b49a5f556aee045c |
01-Apr-2014 |
Alexandra Gherghina <alexgherghina@google.com> |
Mark CalendarProvider as required for all profiles
Change-Id: I3daf1d8e53967070780fb07eaf544c0392e0669f
ndroidManifest.xml
|
| 1092905dde5ca778ac1627e3f9964aa9ca2b1b10 |
18-Mar-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE
Change-Id: I42e81a2074f8eef00b890ce13b52bd12c5862143
Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-fa/strings.xml
es/values-iw/strings.xml
|
| 4a50e88d7917e6b81d364439d634251ae74a74b3 |
09-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Remove deprecated locales
Bug:11340849
Change-Id: Ia1a0a8ea8c1aa4222e62c86c4784056dfc6288b7
es/values-be/strings.xml
es/values-et/strings.xml
es/values-hy/strings.xml
es/values-ka/strings.xml
es/values-km/strings.xml
es/values-lo/strings.xml
es/values-mn/strings.xml
es/values-ms/strings.xml
|
| 50beaf89feb0e84892558a8ebac378d3233d5499 |
19-Nov-2013 |
Alon Albert <aalbert@google.com> |
am 20360f2f: am 141dd1b4: am 0aeb0943: Merge "Ignore Wakelock Under-Locked Exception" into klp-dev
* commit '20360f2fdd7ad2de1234b7ed61e3ea120f0dc635':
Ignore Wakelock Under-Locked Exception
|
| 20360f2fdd7ad2de1234b7ed61e3ea120f0dc635 |
19-Nov-2013 |
Alon Albert <aalbert@google.com> |
am 141dd1b4: am 0aeb0943: Merge "Ignore Wakelock Under-Locked Exception" into klp-dev
* commit '141dd1b42c9b84035abccc99f85bdc93db359f62':
Ignore Wakelock Under-Locked Exception
|
| 141dd1b42c9b84035abccc99f85bdc93db359f62 |
19-Nov-2013 |
Alon Albert <aalbert@google.com> |
am 0aeb0943: Merge "Ignore Wakelock Under-Locked Exception" into klp-dev
* commit '0aeb094381148a08ae05c805f1c91a5c6b6e4900':
Ignore Wakelock Under-Locked Exception
|
| 0aeb094381148a08ae05c805f1c91a5c6b6e4900 |
19-Nov-2013 |
Alon Albert <aalbert@google.com> |
Merge "Ignore Wakelock Under-Locked Exception" into klp-dev
|
| d46932bf3e0cc194ca8e6194a9f4e619b6bd009f |
19-Nov-2013 |
Alon Albert <aalbert@google.com> |
Ignore Wakelock Under-Locked Exception
Bug: 11751204
Change-Id: I78d9e16ea83a06e1fe3e69b0d8a596d16da271f7
rc/com/android/providers/calendar/CalendarAlarmManager.java
|
| 3cf6b96bc2beb0ceb8ce46f0bd62898bb36c3003 |
13-Nov-2013 |
Alon Albert <aalbert@google.com> |
am bad06d30: am 88d84da9: am 98e01573: Initialize WakeLock in the CTOR
* commit 'bad06d305e1ce6f2c020f353f93ab2e232c34da2':
Initialize WakeLock in the CTOR
|
| bad06d305e1ce6f2c020f353f93ab2e232c34da2 |
13-Nov-2013 |
Alon Albert <aalbert@google.com> |
am 88d84da9: am 98e01573: Initialize WakeLock in the CTOR
* commit '88d84da9b99dfdfdd87963e13f430c882f01e3ef':
Initialize WakeLock in the CTOR
|
| 88d84da9b99dfdfdd87963e13f430c882f01e3ef |
13-Nov-2013 |
Alon Albert <aalbert@google.com> |
am 98e01573: Initialize WakeLock in the CTOR
* commit '98e01573880a2f1b1547d1e2e9a1c5c7d5e09043':
Initialize WakeLock in the CTOR
|
| 98e01573880a2f1b1547d1e2e9a1c5c7d5e09043 |
12-Nov-2013 |
Alon Albert <aalbert@google.com> |
Initialize WakeLock in the CTOR
Protect against possible race
Also added a log that will indicate if a second provider is created in the in
same process.
Bug: 11260491
Change-Id: I3048d3c57d1cf6a13b808b85151d20ddb85d95a9
rc/com/android/providers/calendar/CalendarAlarmManager.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2ForTesting.java
|
| 9b0e8f19bbfe529372189cd4396b6abf0b07083e |
06-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am cf0aea38: (-s ours) am 144c89cf: (-s ours) am 579cae45: (-s ours) Import translations. DO NOT MERGE
* commit 'cf0aea38ed4f8032517b734b89868bf9b331a9b8':
Import translations. DO NOT MERGE
|
| cf0aea38ed4f8032517b734b89868bf9b331a9b8 |
06-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 144c89cf: (-s ours) am 579cae45: (-s ours) Import translations. DO NOT MERGE
* commit '144c89cfaa03f52086381ab90aed29d5cd60212e':
Import translations. DO NOT MERGE
|
| 144c89cfaa03f52086381ab90aed29d5cd60212e |
06-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 579cae45: (-s ours) Import translations. DO NOT MERGE
* commit '579cae45d34ee6096bd22385d45c94876da01145':
Import translations. DO NOT MERGE
|
| 579cae45d34ee6096bd22385d45c94876da01145 |
05-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Iacf412bf332a5c9562891338e6e9e159553b4ca8
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-iw/strings.xml
|
| a2ec465c52fe94ea397ff11673b47bd58b5168cc |
01-Nov-2013 |
Alon Albert <aalbert@google.com> |
am ebb69a46: am ad858411: Merge "Don\'t trigger a sync for ALERTS tables" into klp-dev
* commit 'ebb69a46ffbd5bcd3913b4f3829efdfe2d84adde':
Don't trigger a sync for ALERTS tables
|
| ebb69a46ffbd5bcd3913b4f3829efdfe2d84adde |
01-Nov-2013 |
Alon Albert <aalbert@google.com> |
am ad858411: Merge "Don\'t trigger a sync for ALERTS tables" into klp-dev
* commit 'ad8584116bf0fb9d494ec7e5dd2354029ed18306':
Don't trigger a sync for ALERTS tables
|
| ad8584116bf0fb9d494ec7e5dd2354029ed18306 |
01-Nov-2013 |
Alon Albert <aalbert@google.com> |
Merge "Don't trigger a sync for ALERTS tables" into klp-dev
|
| a55c3aaa2b13b5350918efda98906afb8b6206c1 |
31-Oct-2013 |
Alon Albert <aalbert@google.com> |
Don't trigger a sync for ALERTS tables
Bug: 11350900
Change-Id: Iede3da60cb45ac496bea90c85d06eac36af617e1
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/SQLiteContentProvider.java
ests/src/com/android/providers/calendar/CalendarProvider2ForTesting.java
|
| 6992a95cbd835b2998f742fcc1ff059c392dc3a5 |
30-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I1a12fc36c4d68bc4201cba212f9f690955a1b102
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-iw/strings.xml
|
| 89da0ee35aa2c1a0fc733501494a81d62c1d2a90 |
29-Oct-2013 |
Alon Albert <aalbert@google.com> |
am 1b405aa2: am d3b51e17: Handle Missing Event Row
* commit '1b405aa2004c7878bf0dde6308641d56ad596e1e':
Handle Missing Event Row
|
| 1b405aa2004c7878bf0dde6308641d56ad596e1e |
29-Oct-2013 |
Alon Albert <aalbert@google.com> |
am d3b51e17: Handle Missing Event Row
* commit 'd3b51e172bba03af7d2fcc3559cfa73b6ce60095':
Handle Missing Event Row
|
| d3b51e172bba03af7d2fcc3559cfa73b6ce60095 |
28-Oct-2013 |
Alon Albert <aalbert@google.com> |
Handle Missing Event Row
When checking for Calendars.CAN_PARTIALLY_UPDATE in duplicateEvent() , don't
crash if there is no matching event id in the db.
Bug: 11392862
Change-Id: I895c3a307b842c4340c851da27c25951d3e7968f
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| bd663bcbda79033d9bbbeca2ee08909b8a71da09 |
09-Oct-2013 |
Ed Heyl <edheyl@google.com> |
am dcf03845: am 718f0835: merge in KQS81M
* commit 'dcf03845abdc309a3660985cd00222d38e66ac60':
|
| dcf03845abdc309a3660985cd00222d38e66ac60 |
09-Oct-2013 |
Ed Heyl <edheyl@google.com> |
am 718f0835: merge in KQS81M
* commit '718f083598885f56e49d1846dab0f37607ef33d7':
|
| 718f083598885f56e49d1846dab0f37607ef33d7 |
09-Oct-2013 |
Ed Heyl <edheyl@google.com> |
merge in KQS81M
|
| a4271b5b072f7cff4384a41ce5a6580c40eba404 |
18-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 43b71d5302f6a768fd7e6eb11289f71f138bd55e |
18-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
| 5d55f58e83d0feb2fcefcbb35d3b0ab35238541a |
17-Sep-2013 |
Alon Albert <aalbert@google.com> |
am 1d5fe248: am 8015a408: Call clearCallingIdentity in Provider Entry Points
* commit '1d5fe24831fce5b931ca129fec3a59b4172c9061':
Call clearCallingIdentity in Provider Entry Points
|
| 1d5fe24831fce5b931ca129fec3a59b4172c9061 |
17-Sep-2013 |
Alon Albert <aalbert@google.com> |
am 8015a408: Call clearCallingIdentity in Provider Entry Points
* commit '8015a4086559d9d025473c2e773b2f64888c2942':
Call clearCallingIdentity in Provider Entry Points
|
| 8015a4086559d9d025473c2e773b2f64888c2942 |
16-Sep-2013 |
Alon Albert <aalbert@google.com> |
Call clearCallingIdentity in Provider Entry Points
Bug: 10777084
Change-Id: I7de6289e9b05b2ef51a9fe65c3a04f0d814c3362
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/SQLiteContentProvider.java
|
| d67d739fd3bf9f7f5cbdb1520f8fbe8d2396ae41 |
15-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am c61b024a: (-s ours) am 3709ffc4: (-s ours) Import translations. DO NOT MERGE
* commit 'c61b024a95ecb9c18e133316fa8a624e461f6007':
Import translations. DO NOT MERGE
|
| c61b024a95ecb9c18e133316fa8a624e461f6007 |
15-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 3709ffc4: (-s ours) Import translations. DO NOT MERGE
* commit '3709ffc4dc218bd56d9d19a09ee5b9a8d95eb9c7':
Import translations. DO NOT MERGE
|
| 3709ffc4dc218bd56d9d19a09ee5b9a8d95eb9c7 |
15-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I8806d3bd9dd2962099fd3b1596647c0cc090e73c
Auto-generated-cl: translation import
es/values-en-rIN/strings.xml
es/values-et-rEE/strings.xml
es/values-fr-rCA/strings.xml
es/values-hi/strings.xml
es/values-hy-rAM/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-lo-rLA/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-zh-rHK/strings.xml
|
| 222ed5f7233893588d82480f11c61e4c1939f919 |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I713f8a537c0aeaefd02632308c3f2363929f822e
Auto-generated-cl: translation import
es/values-hi/strings.xml
|
| 3fcdbd029f0848221394f98ab973a122df366895 |
04-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I8c247d9eb8b976177b4a40472830d861f6b80cdc
Auto-generated-cl: translation import
es/values-hi/strings.xml
|
| d7c1b714c93e8b3787d6e26aa36216b2c489b12f |
29-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I5e78707c002677ea65eb258067748b68ab90a1a6
Auto-generated-cl: translation import
es/values-az-rAZ/strings.xml
es/values-mn-rMN/strings.xml
|
| d745cdf3e6c09dd88e09e45a4853683fc58df65a |
27-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I7d669f188f4ef3baeb39b72028a07034ea88cd18
Auto-generated-cl: translation import
es/values-et-rEE/strings.xml
es/values-hy-rAM/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-lo-rLA/strings.xml
es/values-ms-rMY/strings.xml
es/values-ne-rNP/strings.xml
es/values-si-rLK/strings.xml
|
| a28d5d4375b08eb770d0000a5281b1423339eb0a |
20-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ibe99e3cdb4963a54f199c9a7610c092d6ddc8a4c
Auto-generated-cl: translation import
es/values-az/strings.xml
es/values-en-rIN/strings.xml
es/values-fr-rCA/strings.xml
es/values-hy/strings.xml
es/values-ka/strings.xml
es/values-km/strings.xml
es/values-lo/strings.xml
es/values-mn/strings.xml
es/values-ne/strings.xml
es/values-si/strings.xml
es/values-zh-rHK/strings.xml
|
| 74dfe7de007563af5cab1c1bb458f4ebd4e4f66d |
19-Jul-2013 |
Christopher Tate <ctate@google.com> |
Make sure to use exact alarms for Calendar events
Change-Id: Idfe11d65c81999b76cbbe2611bb77816f0c8875a
rc/com/android/providers/calendar/CalendarAlarmManager.java
|
| c817154d2185340a0d0d4b81f06e33e32ce81b37 |
27-Jun-2013 |
Alon Albert <aalbert@google.com> |
Remove RDATE, EXRULE & EXDATE From Exception
When inserting an exception all recurrence fields need to be stripped.
Bug: 9598339
Change-Id: I1226b135c170015073d020aaf791774ff10dc0dd
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 935d2d3bc7df6710b7e0910f23d1b0a9719f2a3a |
10-May-2013 |
Christopher Tate <ctate@google.com> |
The Calendar provider needs privileged permissions
Bug 8765951
Change-Id: Ibc2b4bae860a977568e341d071c1954cd4b7d8d7
ndroid.mk
|
| f9ba145db4f9b6567983f650e54b30fd949d4cce |
18-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I095165951cd06a5c0c9b797fab5f0db1b767d9ee
Auto-generated-cl: translation import
es/values-ro/strings.xml
|
| ccfee5ca255652892b407fa046a797bf62d3b1c3 |
04-Feb-2013 |
Alon Albert <aalbert@google.com> |
Add EVENT_COLOR's to Event Entity Iterator
Bug: 8132457
Change-Id: I292d10844bdeb21a2845a656dd0676b9acb8219e
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 043587d3ef1a9cc156a6819fdcb7ef5b2aa81ed4 |
25-Jan-2013 |
Dianne Hackborn <hackbod@google.com> |
Protect calendar with app ops.
Change-Id: I9d6705b0fa5257434a825809ad46d422f2ee57cc
ndroidManifest.xml
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 7a2531a4b68e9efe14353cc7f4a64a8c5613e5d3 |
18-Dec-2012 |
Alon Albert <aalbert@google.com> |
Put some useful information in User-Agent Header
Put information in User-Agent:
* Build fingerprint
* Calendar or CalendarSyncAdapter package name + version code
* Package name of app making changes to provider for uphill syncs
Example:
google/mantaray/manta:K/MASTER/eng.aalbert.20121217.140040:eng/dev-keys:com.google.android.calendar:201212060:com.google.android.calendar Google-HTTP-Java-Client/1.11.0-beta (gzip)
Change-Id: I729c64ba9b922523d35903fcaf2a51cc234799a8
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 746015647838dad7abeb7d0fc40ec49b722148ae |
12-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: I7226fbe0f633f92a93feb148f9806eff46531135
Auto-generated-cl: translation import
es/values-de/strings.xml
|
| 7a0d5b82a70ee5734f869583e04514f4f36d793f |
16-Oct-2012 |
Sara Ting <sarating@google.com> |
am 49b7d3c4: Fix race condition for missing alerts after boot up.
* commit '49b7d3c4222a6b9e8e4639ba6d5128df5eac7e73':
Fix race condition for missing alerts after boot up.
|
| 49b7d3c4222a6b9e8e4639ba6d5128df5eac7e73 |
12-Oct-2012 |
Sara Ting <sarating@google.com> |
Fix race condition for missing alerts after boot up.
After boot up, it was possible to miss scheduling alerts due to improper synchronization of the BOOT_COMPLETED and TIME_CHANGED actions.
Bug:7221716
Change-Id: Id97266a19bb1ff8182576f687c34e10ef8644dc6
rc/com/android/providers/calendar/CalendarAlarmManager.java
|
| 78bd04e183a9d8d8c031cc4d1c9b66f718da7bce |
02-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 65dd5386: (-s ours) am 1687164a: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '65dd538630d0961b7d732a27da02817186eb7d26':
Fix event color query (which fixes the failing CTS test).
|
| 65dd538630d0961b7d732a27da02817186eb7d26 |
02-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 1687164a: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '1687164a25c537f456cb4d212d128c99870bdf07':
Fix event color query (which fixes the failing CTS test).
|
| 1687164a25c537f456cb4d212d128c99870bdf07 |
02-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr0-release - do not merge
Change-Id: I22a716496e377e047ccf9d19cd30833225707565
|
| 80c9f359cd4024e47888562f2de2138cac823f0b |
02-Oct-2012 |
Sara Ting <sarating@google.com> |
am d2e4cb09: am f4b1756f: Fix event color query (which fixes the failing CTS test).
* commit 'd2e4cb09054364f1b09e453426f642961cfbf7cf':
Fix event color query (which fixes the failing CTS test).
|
| 485a1841b281b83e35229b1bb385986d43608aa1 |
02-Oct-2012 |
Sara Ting <sarating@google.com> |
Fix event color query (which fixes the failing CTS test).
Bug:7261590
Change-Id: I72c60af1ae8d563db7693fdf7d87972dfc80ab82
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| d2e4cb09054364f1b09e453426f642961cfbf7cf |
02-Oct-2012 |
Sara Ting <sarating@google.com> |
am f4b1756f: Fix event color query (which fixes the failing CTS test).
* commit 'f4b1756f88c34efefb33b4103230ee334d9c9262':
Fix event color query (which fixes the failing CTS test).
|
| f4b1756f88c34efefb33b4103230ee334d9c9262 |
02-Oct-2012 |
Sara Ting <sarating@google.com> |
Fix event color query (which fixes the failing CTS test).
Bug:7261590
Change-Id: I72c60af1ae8d563db7693fdf7d87972dfc80ab82
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 864156f921fc1d49517cfc3e04a6a7b7a7c4eab2 |
28-Sep-2012 |
Sara Ting <sarating@google.com> |
am b5570054: Merge "Fix possible NPE in runScheduleNextAlarm." into jb-mr1-dev
* commit 'b5570054791d2ae2743ab952a7f0e1d0ccf4d0ad':
Fix possible NPE in runScheduleNextAlarm.
|
| b5570054791d2ae2743ab952a7f0e1d0ccf4d0ad |
27-Sep-2012 |
Sara Ting <sarating@google.com> |
Merge "Fix possible NPE in runScheduleNextAlarm." into jb-mr1-dev
|
| a7c3f329245dc370151e611fdad85e177f4f6000 |
27-Sep-2012 |
Sara Ting <sarating@google.com> |
Fix possible NPE in runScheduleNextAlarm.
Bug:7244877
Change-Id: Ifda7343cd154fc53a8b7e39fd747c3088f21a5eb
rc/com/android/providers/calendar/CalendarAlarmManager.java
|
| 01ee1808cbacfec804f4058a3e6538203659fb6d |
25-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE
Change-Id: If1b588c7bf97f5115af499dda727be3c94cdf316
Auto-generated-cl: translation import
es/values-ca/strings.xml
|
| 501e60bcb1b519d80723f7b64ba60bd079b8ec8d |
17-Sep-2012 |
Sara Ting <sarating@google.com> |
Adding new column 'uid2445' to Events table to support future handling of ical/ics format.
Bug:7029852
Change-Id: Ie2e5c0126583a68d2da81b6cc7c0101e29eb0649
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| b2695bf3cfb173c4c5ba7bfd3c93ba8a51d65810 |
18-Sep-2012 |
Alon Albert <aalbert@google.com> |
Add some columns
isPrimary to Calendars
isOrganizer to Events
Bug: 6888477
Change-Id: I6ea7d69eec4a7226bf3e9fac216a31b5cd170782
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 5cd969369a0e025bad07ad32bda9c8c4f0630457 |
03-Aug-2012 |
Michael Chan <mchan@android.com> |
Renamed calendarcommon to calendarcommon2 to avoid naming conflict with OEM devices
Change-Id: Ia765b4c17bfc00e283c66c440b8561fcd7b8e4dc
rc/com/android/providers/calendar/CalendarInstancesHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/ICalendarTest.java
ests/src/com/android/providers/calendar/RecurrenceSetTest.java
|
| aebdfb4f48d7a85740c93ff1ba3146223e0512e8 |
09-Aug-2012 |
Michael Chan <mchan@android.com> |
am f98ed2e5: Fixed the problem where updating event colors would cause exceptions
* commit 'f98ed2e5c5e08cac159ce4cf22ab86a718f0bb0b':
Fixed the problem where updating event colors would cause exceptions
|
| 10651e7b4f209a03649b9eac62facbc7bf864d17 |
25-Jul-2012 |
Michael Chan <mchan@android.com> |
Fixed the problem where updating event colors would cause exceptions
Bug: 6742712
Change-Id: Ie097e05c74995513b5b6fc04efd8e0d35876b698
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| e4c1121b821d0f1eb893c8326662384bd1c89867 |
28-Jul-2012 |
Nick Kralevich <nnk@google.com> |
Explicitly export content providers
In a future version of Android, the default value for
<provider android:exported> will change from true to false.
Explicitly set android:exported="true"
Bug: 3306452
Change-Id: I18fb3f7afe37c8e463b27e05077e207b7ef13d86
ndroidManifest.xml
|
| f98ed2e5c5e08cac159ce4cf22ab86a718f0bb0b |
25-Jul-2012 |
Michael Chan <mchan@android.com> |
Fixed the problem where updating event colors would cause exceptions
Bug: 6742712
Change-Id: Ie097e05c74995513b5b6fc04efd8e0d35876b698
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 05d87ba213941d7f3375e68bbb7753acb3ca5529 |
13-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ia8c1dd6713c7ae6067d05879186b98093e9c2887
Auto-generated-cl: translation import
es/values-fa/strings.xml
|
| a6f5576f5be32c1c50d6a3361fb7709908e16e3f |
02-Jul-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ie5e78a2a217eb4ac02b97ac29b360032899c6f87
Auto-generated-cl: translation import
es/values-zh-rCN/strings.xml
|
| 93fcf7a52b2231a96d99b8792c5bbbeef09b7ac4 |
18-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE
Change-Id: I32b07fcdf146e01c8d15f59a403ef2f6d7d3d9a0
es/values-tr/strings.xml
|
| 35225e0167fee2675cabfffb94c6f9e4b679db20 |
31-May-2012 |
Sara Ting <sarating@google.com> |
Merge "Update widget after changing attendee status." into jb-dev
|
| 8ca3274cd6bb8cf43992f9be6725c89d770011a7 |
25-May-2012 |
Sara Ting <sarating@google.com> |
Update widget after changing attendee status.
Bug:5934675
Change-Id: I51a9f3f1b7c4cce405d80d1bc92dd3b8a6febf66
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 3eb3e9b3e8f8fc287528c61aa86e042e550a965e |
23-May-2012 |
Christian Robertson <robertsonc@google.com> |
Updating launcher icon to fix alignment. Bug: 6511716
Change-Id: Ib6d2b0aab346a53036a032dd1fd5eccb2e9a2428
es/drawable-hdpi/app_icon.png
es/drawable-mdpi/app_icon.png
es/drawable-xhdpi/app_icon.png
|
| c3f54281b3b4a1646923a726c9a1731bd39324a0 |
29-Apr-2012 |
Michael Chan <chanm@google.com> |
Keep the device awake while we schedule the next alarm
Bug: 5777855
Change-Id: I59e97ce69e0dcbaf1b8eaa25407f2d3234140b98
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/CalendarReceiver.java
|
| 0332925aa9db8c4826327edd85030a4791b7a8e6 |
29-Apr-2012 |
Michael Chan <chanm@google.com> |
Fixed so potential memory leaks.
Bug: 6396900
Change-Id: Id02c323b567bfc49ae1da4dbe4335ba150241232
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarInstancesHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| c81732aeadada8f8bc4c216a317ba458374af2c9 |
21-Apr-2012 |
Michael Chan <chanm@google.com> |
Add support for custom app and uri in events
Bug: 6325441
Change-Id: If4a0f855e21d10aa63be67c5bb702618b776b29b
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarDatabaseHelperTest.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| bafe9de156292f65b1079dd1eb586669f573d9e6 |
18-Apr-2012 |
Michael Chan <chanm@google.com> |
Add support for identity in attendees
Bug: 6353721
Change-Id: If167941b90b256073444f2660df2360f79872276
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/AndroidManifest.xml
ests/src/com/android/providers/calendar/CalendarDatabaseHelperTest.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 0d8699eedb0f3bcec1854b9753ae59154a122726 |
03-Mar-2012 |
Michael Chan <chanm@google.com> |
Drop all table when downgrading
Change-Id: I172d82eabeaa0f55831da9d105beb995ad1c3448
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| aa384f47ace1e7d90d9fe2235e5b5f2ce42a3746 |
03-Apr-2012 |
Mike Lockwood <lockwood@google.com> |
Merge remote-tracking branch 'goog/ics-aah'
|
| 68609b8d3d5548cf21b2498739c3d84372133955 |
02-Apr-2012 |
Sara Ting <sarating@google.com> |
Merge "Fix for b/6176691: Move disk I/O during SCHEDULE_ALARM broadcast to a background thread."
|
| ca25e4029cb48c2c165872a4253a00975404060f |
30-Mar-2012 |
Sara Ting <sarating@google.com> |
Fix for b/6176691: Move disk I/O during SCHEDULE_ALARM broadcast to a background thread.
Change-Id: Ica5cd6c72687f7252ce4a6b22e66e9eff4a00b50
rc/com/android/providers/calendar/CalendarReceiver.java
|
| 90b9254f6e5f990cfed3d11328f79a2db503961f |
28-Mar-2012 |
Isaac Katzenelson <isaack@android.com> |
Merge "Fix original sync id bug in event exceptions"
|
| ff5d02de9fddecbd5649f243233514e256a705c2 |
24-Mar-2012 |
Isaac Katzenelson <isaack@android.com> |
Fix original sync id bug in event exceptions
Bug: 6168812 original_id and/or original_sync_id may be wrong when there are multiple accounts
Change-Id: Icdc77abcc492a28b1ed04931f53b0ee9d8bffda8
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 7d2893944e9f968cda397c889e36ed43e12f4293 |
27-Mar-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: Ic1d06e92a0986eacba2cc3e5e4c49748bb25dac9
es/values-in/strings.xml
|
| 351143eab87aa28ee81562f06fc960e23afbd3f3 |
26-Mar-2012 |
Alon Albert <aalbert@google.com> |
Merge "Throw if URI contains unknown parameters"
|
| 8d2ed3bf1ef3525c3a6eb17b57f07b0af35ef4d0 |
23-Mar-2012 |
Alon Albert <aalbert@google.com> |
Throw if URI contains unknown parameters
Bug: 5784822
Change-Id: I89cd4633a03bf949f46becd94b356f563af9b053
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 9b7b3f63c5097faa220f81e40a3a4bd6ae1180a3 |
23-Mar-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I976293c5867cd1429df7ffeb7b5ebe195606b391
es/values-zh-rCN/strings.xml
|
| 8ca4cfe3c18cbfd332dd622935e802ee25b35e37 |
23-Mar-2012 |
Alon Albert <aalbert@google.com> |
Merge "Move Duration to common"
|
| 8253a84ce7abf2fa1c662b735432a502f4ace96f |
22-Mar-2012 |
Alon Albert <aalbert@google.com> |
Allow instance deletion event without DTSART
Change-Id: Icbd063ffab1f198fa262b62fb2cb273aed30e4ad
rc/com/android/providers/calendar/CalendarProvider2.java
|
| fa2f3b5b13ae14bf023aa45120b617e53d42a9dc |
17-Mar-2012 |
Alon Albert <aalbert@google.com> |
Move Duration to common
Change-Id: I6a758ff462cd5338e7b12a5c000ab3613addb399
rc/com/android/providers/calendar/CalendarInstancesHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/Duration.java
ests/src/com/android/providers/calendar/DurationTest.java
|
| b105159e23968950ef8fee123539569ee09a4240 |
13-Mar-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I4990de22b749ba3865ff075c8e9bf821355e844b
es/values-in/strings.xml
|
| 18be719ab7391f3d66c6064cc11f29ab132be4f6 |
07-Mar-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I161e7b3524f0ad6e2f460b9b1c3efce7954135a2
es/values-in/strings.xml
|
| c339afc7df041ebfc5f4587f78cf38562aa23459 |
02-Mar-2012 |
Alon Albert <aalbert@google.com> |
Add displayColor column to view_events
Also fix bug with color change triggers
Change-Id: I0b62fb966cd9f24f47646c3a3613403e4ff4cc1e
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 4755452ab84f704f8ce4d7e0bf61a9faeeee2b99 |
01-Mar-2012 |
Michael Chan <mchan@android.com> |
Fixed the bug where one can't insert colors with the same key but different type.
Bug: 6075521
Change-Id: I7d16febe90735d64af8fbc8c5c7a73941e416ee5
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| d54e162756778d286fa5b60eb77a741dacfb09cb |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am 50c3fd3a: (-s ours) am a5bb9139: (-s ours) am 5d2ceed5: Import translations. DO NOT MERGE
* commit '50c3fd3af501215f3d0c00c006fbebd3e7b9bab8':
|
| f5d04b06cf0a32b364402cc7c889d622f8658024 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am b1134ce4: (-s ours) am 5d2ceed5: Import translations. DO NOT MERGE
* commit 'b1134ce47336a9b3dfd650dbecbd8d0f38881d49':
Import translations. DO NOT MERGE
|
| 50c3fd3af501215f3d0c00c006fbebd3e7b9bab8 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am a5bb9139: (-s ours) am 5d2ceed5: Import translations. DO NOT MERGE
* commit 'a5bb91390d1a1c056252000bdebff1d018e9bfea':
|
| b1134ce47336a9b3dfd650dbecbd8d0f38881d49 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am 5d2ceed5: Import translations. DO NOT MERGE
* commit '5d2ceed510652869d572d7a9182dcaa0cfa6f0cb':
Import translations. DO NOT MERGE
|
| 57807bf3b5d4d817a44bc81f96a1ac1dc930b6b8 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am 5d2ceed5: Import translations. DO NOT MERGE
* commit '5d2ceed510652869d572d7a9182dcaa0cfa6f0cb':
Import translations. DO NOT MERGE
|
| a5bb91390d1a1c056252000bdebff1d018e9bfea |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am 5d2ceed5: Import translations. DO NOT MERGE
* commit '5d2ceed510652869d572d7a9182dcaa0cfa6f0cb':
Import translations. DO NOT MERGE
|
| 5d2ceed510652869d572d7a9182dcaa0cfa6f0cb |
09-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I0e7a478b29e948829bf833afb4011cc45ec009e1
es/values-es-rUS/strings.xml
es/values-zu/strings.xml
|
| d5af586101b6111ca188bb373098309c7c8a4abb |
03-Feb-2012 |
Alon Albert <aalbert@google.com> |
Fix Typo that was causing a throwwhen updating Colors table
android.database.sqlite.SQLiteException: no such column: color: , while compiling: UPDATE Calendars SET color=? WHERE account_name=? AND account_type=? AND calendar_color_index=?
at android.database.sqlite.SQLiteConnection.nativePrepareStatement(Native Method)
at android.database.sqlite.SQLiteConnection.acquirePreparedStatement(SQLiteConnection.java:704)
at android.database.sqlite.SQLiteConnection.prepare(SQLiteConnection.java:324)
at android.database.sqlite.SQLiteSession.prepare(SQLiteSession.java:588)
at android.database.sqlite.SQLiteProgram.<init>(SQLiteProgram.java:58)
at android.database.sqlite.SQLiteStatement.<init>(SQLiteStatement.java:31)
at android.database.sqlite.SQLiteDatabase.updateWithOnConflict(SQLiteDatabase.java:1450)
at android.database.sqlite.SQLiteDatabase.update(SQLiteDatabase.java:1403)
at com.android.providers.calendar.CalendarProvider2.handleUpdateColors(CalendarProvider2.java:3577)
at com.android.providers.calendar.CalendarProvider2.updateInTransaction(CalendarProvider2.java:3822)
at com.android.providers.calendar.SQLiteContentProvider.update(SQLiteContentProvider.java:159)
at android.content.ContentProviderOperation.apply(ContentProviderOperation.java:225)
at com.android.providers.calendar.SQLiteContentProvider.applyBatch(SQLiteContentProvider.java:224)
at android.content.ContentProvider$Transport.applyBatch(ContentProvider.java:216)
at android.content.ContentProviderNative.onTransact(ContentProviderNative.java:179)
at android.os.Binder.execTransact(Binder.java:338)
at dalvik.system.NativeStart.run(Native Method)
Change-Id: I3f28f3c3cef1692942d8f4a7fc9f49c7d6d2adf8
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 7df0cc0104c6a608a5a7eef0e50eed63423c8d70 |
26-Jan-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE
Change-Id: I71bb6807ec6fd601095464f7f61b0d3b3a621082
es/values-be/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
|
| 465c10df06ef302a035b4a26456fd6b3d758d5cf |
21-Jan-2012 |
Michael Chan <mchan@android.com> |
am 7bca7b95: am c3780839: Fixed the problem where search result for recurring events were incomplete.
* commit '7bca7b95be5f7acfcb18716af951ae42aa37639b':
Fixed the problem where search result for recurring events were incomplete.
|
| 7bca7b95be5f7acfcb18716af951ae42aa37639b |
20-Jan-2012 |
Michael Chan <mchan@android.com> |
am c3780839: Fixed the problem where search result for recurring events were incomplete.
* commit 'c3780839fd044b5d8109860b57a199a2da1d804f':
Fixed the problem where search result for recurring events were incomplete.
|
| f72b54f1caedea317bbe3577cb193c6b6b7c6979 |
20-Jan-2012 |
Michael Chan <mchan@android.com> |
am c3780839: Fixed the problem where search result for recurring events were incomplete.
* commit 'c3780839fd044b5d8109860b57a199a2da1d804f':
Fixed the problem where search result for recurring events were incomplete.
|
| c3780839fd044b5d8109860b57a199a2da1d804f |
19-Jan-2012 |
Michael Chan <mchan@android.com> |
Fixed the problem where search result for recurring events were incomplete.
Specifically instead of showing multiple instances, the search would return only 1 instance.
Bug: 5824042
Change-Id: Ifa57b00e8287bc6ebd343cbe4256a4e91afc79bf
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 77f0cf2de36fd24541480638da22f477ec0af22f |
12-Jan-2012 |
Alon Albert <aalbert@google.com> |
Fix a problem with isCallerSyncAdapter
The field mIsCallerSyncAdapter is set by a call to getIsCallerSyncAdapter() but is reset by beginTransaction.
This means that by the time we call endTransaction, it may have been reset to null because getIsCallerSyncAdapter
was called before beginTransaction.
Change-Id: I3f8e4484965adae2d7565e34166f4c1a6635eecf
rc/com/android/providers/calendar/SQLiteContentProvider.java
|
| f3ac7696180b6018338bbef2e9c65a59750d905f |
05-Jan-2012 |
Michael Chan <mchan@android.com> |
am 931bf7bb: am bfea6da7: Added logging for to debug bad events
* commit '931bf7bb23fe4e48c251e4bbbd7abb3e11831538':
Added logging for to debug bad events
|
| 931bf7bb23fe4e48c251e4bbbd7abb3e11831538 |
05-Jan-2012 |
Michael Chan <mchan@android.com> |
am bfea6da7: Added logging for to debug bad events
* commit 'bfea6da707f8d352432096371e7da76c230d9059':
Added logging for to debug bad events
|
| 9cf74538f0f56b431a3924276d750a5afd4fd977 |
05-Jan-2012 |
Michael Chan <mchan@android.com> |
am bfea6da7: Added logging for to debug bad events
* commit 'bfea6da707f8d352432096371e7da76c230d9059':
Added logging for to debug bad events
|
| 8c14c8e7fec15a896db46db2a99600784227882d |
29-Dec-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: Ia8b049e4921312835264dc26c975be27e33c9a73
es/values-zu/strings.xml
|
| bfea6da707f8d352432096371e7da76c230d9059 |
22-Dec-2011 |
Michael Chan <mchan@android.com> |
Added logging for to debug bad events
Bug: 5676414
Change-Id: I9af54046ecea9a7736d797ce68af0f88b35d6a0f
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 9adfc5e7e2c0b41ba2f53eb2397886dd61ec5f8a |
05-Dec-2011 |
Andy McFadden <fadden@android.com> |
am 6d38c46e: am 3ac8148c: Speed up database update
* commit '6d38c46ea04674a1cbfafd04a0313a65f915c9f3':
Speed up database update
|
| 6d38c46ea04674a1cbfafd04a0313a65f915c9f3 |
05-Dec-2011 |
Andy McFadden <fadden@android.com> |
am 3ac8148c: Speed up database update
* commit '3ac8148cdc79bde4b009ccb6a9ffda77bdb547d3':
Speed up database update
|
| 9a803c406cfce0ccf8040a23ea73a2ff9aefa13a |
05-Dec-2011 |
Andy McFadden <fadden@android.com> |
am 3ac8148c: Speed up database update
* commit '3ac8148cdc79bde4b009ccb6a9ffda77bdb547d3':
Speed up database update
|
| 3ac8148cdc79bde4b009ccb6a9ffda77bdb547d3 |
03-Dec-2011 |
Andy McFadden <fadden@android.com> |
Speed up database update
Drop the trigger on sync_id before doing a bulk update of sync_id
fields. This dramatically reduces the time required for the
calendar database update when there are lots of events.
Bug 5699796
Change-Id: I94c2fb624b5b63bfdf760b3092697f9205a634c9
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| c159f82f143649f12526a3c9acb196fd64cb6816 |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
am 7c5e4577: Import revised translations. DO NOT MERGE
* commit '7c5e457794b94b25774949fdc6f2e02e59c8a074':
Import revised translations. DO NOT MERGE
|
| fe37ec3d35b91666dcd3321f1836decd4100552b |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
am 339cdebb: (-s ours) am 7c5e4577: Import revised translations. DO NOT MERGE
* commit '339cdebb8fe39c2a1fbf7b38628cf3cbcd6eca1b':
Import revised translations. DO NOT MERGE
|
| 339cdebb8fe39c2a1fbf7b38628cf3cbcd6eca1b |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
am 7c5e4577: Import revised translations. DO NOT MERGE
* commit '7c5e457794b94b25774949fdc6f2e02e59c8a074':
Import revised translations. DO NOT MERGE
|
| 7c5e457794b94b25774949fdc6f2e02e59c8a074 |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
Change-Id: I825d3e2b12293e5dfd46a39c322fad4b33f5594a
es/values-zu/strings.xml
|
| 9f0b0c052bcecb1bf6737283d56f66752e2cf495 |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I169239fdc5a3132ed291c928dbb029a7fd9de25a
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
| 04f8451e893e1502d8ff188bed6d4ac8c2f35f2c |
17-Nov-2011 |
Eric Fischer <enf@google.com> |
am c160e27c: (-s ours) am 2b38acc0: Import revised translations. DO NOT MERGE
* commit 'c160e27c3c36bced882ab69bf42cba77f1d8f6a2':
Import revised translations. DO NOT MERGE
|
| 775349818f70d5c488b82cd5482ed2354a4481a6 |
16-Nov-2011 |
Eric Fischer <enf@google.com> |
am 2b38acc0: Import revised translations. DO NOT MERGE
* commit '2b38acc0aa8b998ec2c614623c3bb436e1be0a16':
Import revised translations. DO NOT MERGE
|
| c160e27c3c36bced882ab69bf42cba77f1d8f6a2 |
16-Nov-2011 |
Eric Fischer <enf@google.com> |
am 2b38acc0: Import revised translations. DO NOT MERGE
* commit '2b38acc0aa8b998ec2c614623c3bb436e1be0a16':
Import revised translations. DO NOT MERGE
|
| 2b38acc0aa8b998ec2c614623c3bb436e1be0a16 |
16-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
Change-Id: If249074a56ed2bb00d32c24dcc02cf02283eae9e
es/values-hi/strings.xml
|
| 8d452e2e9e88fae44c21d61da5d32842325033ef |
16-Nov-2011 |
Eric Fischer <enf@google.com> |
am 94149d90: (-s ours) am d63a8179: am 3430192a: Import revised translations. DO NOT MERGE
* commit '94149d9031d9625406df63bd88f10c2b53353d10':
Import revised translations. DO NOT MERGE
|
| a7018438b0cc6f5e750572a61bb4683b6218314a |
16-Nov-2011 |
Eric Fischer <enf@google.com> |
am d63a8179: am 3430192a: Import revised translations. DO NOT MERGE
* commit 'd63a81794aee04dde4f9dd0773c5ee17a1bef39f':
Import revised translations. DO NOT MERGE
|
| 94149d9031d9625406df63bd88f10c2b53353d10 |
16-Nov-2011 |
Eric Fischer <enf@google.com> |
am d63a8179: am 3430192a: Import revised translations. DO NOT MERGE
* commit 'd63a81794aee04dde4f9dd0773c5ee17a1bef39f':
Import revised translations. DO NOT MERGE
|
| d63a81794aee04dde4f9dd0773c5ee17a1bef39f |
16-Nov-2011 |
Eric Fischer <enf@google.com> |
am 3430192a: Import revised translations. DO NOT MERGE
* commit '3430192ae9e2c00b24a1267765882d19cf41f9d6':
Import revised translations. DO NOT MERGE
|
| c29225320d545b61c5ae8e6b19b64061e804cabe |
15-Nov-2011 |
Andy McFadden <fadden@android.com> |
am bf7c70fe: (-s ours) am 5503ef10: DO NOT MERGE - Move scheduled alarm scrub off main thread
* commit 'bf7c70fed785a9024e5a43ea6fff78340bff8382':
DO NOT MERGE - Move scheduled alarm scrub off main thread
|
| bf7c70fed785a9024e5a43ea6fff78340bff8382 |
15-Nov-2011 |
Andy McFadden <fadden@android.com> |
am 5503ef10: DO NOT MERGE - Move scheduled alarm scrub off main thread
* commit '5503ef10b15a441730f02e5a2cbd41328a424984':
DO NOT MERGE - Move scheduled alarm scrub off main thread
|
| e865a728895aecafd0a87e3aff7a7ae919c003ac |
15-Nov-2011 |
Andy McFadden <fadden@android.com> |
am 5503ef10: DO NOT MERGE - Move scheduled alarm scrub off main thread
* commit '5503ef10b15a441730f02e5a2cbd41328a424984':
DO NOT MERGE - Move scheduled alarm scrub off main thread
|
| 5503ef10b15a441730f02e5a2cbd41328a424984 |
26-Oct-2011 |
Andy McFadden <fadden@android.com> |
DO NOT MERGE - Move scheduled alarm scrub off main thread
We currently do a database update when the "boot completed" intent
is received. Doing it on the main thread appears to be causing ANRs,
so this moves it to a background thread. An "empty" service is
used to discourage the system from killing the provider while this
is in progress.
Also, removed an unused field from CalendarAlarmManager.
Bug 5262151
(cherry-pick from master)
Change-Id: Ic3a3da986b5c8f271a6310e56f61839897ba8336
ndroidManifest.xml
rc/com/android/providers/calendar/CalendarAlarmManager.java
rc/com/android/providers/calendar/CalendarReceiver.java
ests/src/com/android/providers/calendar/CalendarProvider2ForTesting.java
|
| 3430192ae9e2c00b24a1267765882d19cf41f9d6 |
14-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
Change-Id: I432f723ae3897d48a0940c6f32ecc154df0c9ec0
es/values-af/strings.xml
|
| e9b25242d95d6e04d58b53558943054df7c31e7d |
11-Nov-2011 |
Claudia de Veaux <deveaux@google.com> |
Strings edits to meet UI text standards.
* fixed some capitalization
* Use "choose" not "select"
Bug: 5163232
Change-Id: Ib28c41d430da41a26eedc52a7f96626f3522cc25
es/values/strings.xml
|
| 410b33823c47226dfef23e705e0cb69094ac024f |
10-Nov-2011 |
Andy McFadden <fadden@android.com> |
am 1f64c188: (-s ours) am 07a7d5ce: am ba79889d: (-s ours) Disallow empty eventTimezone values. Do not merge
* commit '1f64c188804bc4c15e4a97ed1792dc22ea1b111b':
|
| fb52e9136e5b5bc2f2bece696426ee1d68d63038 |
10-Nov-2011 |
RoboErik <epastern@google.com> |
am ff2ce02c: am 7148c4fb: b/5497057 Remove references to PII from exception messages
* commit 'ff2ce02c7afe404472932d1914460edff1f9f7cc':
b/5497057 Remove references to PII from exception messages
|
| 5c96808b8c1a9f2990549c5c9ec6dceec606113b |
09-Nov-2011 |
Andy McFadden <fadden@android.com> |
am 2b6d670b: (-s ours) am ba79889d: Disallow empty eventTimezone values. Do not merge
* commit '2b6d670b272c74fcb0dfe7cee02b980715f760ab':
Disallow empty eventTimezone values. Do not merge
|
| 98573f1fb822956eb751a4001a1b45b6f74805dc |
09-Nov-2011 |
Andy McFadden <fadden@android.com> |
am 07a7d5ce: am ba79889d: (-s ours) Disallow empty eventTimezone values. Do not merge
* commit '07a7d5ce4ee1e29e01cc46911c97e849db64a317':
Disallow empty eventTimezone values. Do not merge
|
| 5e20def758270173e7b4b05418af0fced0e2b249 |
09-Nov-2011 |
RoboErik <epastern@google.com> |
am 7148c4fb: b/5497057 Remove references to PII from exception messages
* commit '7148c4fbb67fd9b20fb0b92d23e831b05ec22155':
b/5497057 Remove references to PII from exception messages
|
| 1f64c188804bc4c15e4a97ed1792dc22ea1b111b |
09-Nov-2011 |
Andy McFadden <fadden@android.com> |
am 07a7d5ce: am ba79889d: (-s ours) Disallow empty eventTimezone values. Do not merge
* commit '07a7d5ce4ee1e29e01cc46911c97e849db64a317':
|
| 07a7d5ce4ee1e29e01cc46911c97e849db64a317 |
09-Nov-2011 |
Andy McFadden <fadden@android.com> |
am ba79889d: (-s ours) Disallow empty eventTimezone values. Do not merge
* commit 'ba79889dd64ed6ab2ca8d25d97c30e6168f55f6b':
Disallow empty eventTimezone values. Do not merge
|
| ff2ce02c7afe404472932d1914460edff1f9f7cc |
09-Nov-2011 |
RoboErik <epastern@google.com> |
am 7148c4fb: b/5497057 Remove references to PII from exception messages
* commit '7148c4fbb67fd9b20fb0b92d23e831b05ec22155':
b/5497057 Remove references to PII from exception messages
|
| 2b6d670b272c74fcb0dfe7cee02b980715f760ab |
09-Nov-2011 |
Andy McFadden <fadden@android.com> |
am ba79889d: Disallow empty eventTimezone values. Do not merge
* commit 'ba79889dd64ed6ab2ca8d25d97c30e6168f55f6b':
Disallow empty eventTimezone values. Do not merge
|
| 7148c4fbb67fd9b20fb0b92d23e831b05ec22155 |
09-Nov-2011 |
RoboErik <epastern@google.com> |
b/5497057 Remove references to PII from exception messages
Change-Id: I106adf420536e42fd45befec04728755d7347c90
rc/com/android/providers/calendar/CalendarProvider2.java
|
| ba79889dd64ed6ab2ca8d25d97c30e6168f55f6b |
27-Oct-2011 |
Andy McFadden <fadden@android.com> |
Disallow empty eventTimezone values. Do not merge
We now reject insert and update requests from apps that could result
in an Event with a null/empty eventTimezone column.
Bug 5514124 and 5497100
Cherry pick of https://android-git.corp.google.com/g/#/c/145982/
Change-Id: I5f3d1f5f797b5d1da3b24c4ca85d9afaa90449dc
rc/com/android/providers/calendar/CalendarProvider2.java
|
| ca3051f14ada2b976c2c2ebc1860a7cd244a9256 |
02-Nov-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
| c0de8b90b1969ff1609e66c0c8e87adb893192ac |
02-Nov-2011 |
Alon Albert <aalbert@google.com> |
Merge "Don't schedule a sync with SYNC_EXTRAS_MANUAL from the provider. This flag ignores the sync settings for the account"
|
| 6149f6c6ab6904e75d3a07dba86e0084c594b00f |
02-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I74788b2899b3e00b3da2ebbb7764d27de81abc75
es/values-be/strings.xml
es/values-et/strings.xml
|
| a1bd07981f62d94261531cb2ac090281a6f3080c |
02-Nov-2011 |
Eric Fischer <enf@google.com> |
am a20e6bcd: Import revised translations.
* commit 'a20e6bcdc756c398b8688dc04ff82c56bd0900db':
Import revised translations.
|
| 457ecf55b9d83b7fbd99f7707eea2d10ee2bd551 |
01-Nov-2011 |
Alon Albert <aalbert@google.com> |
Don't schedule a sync with SYNC_EXTRAS_MANUAL from the provider. This flag ignores the sync settings for the account
Bug: 5433356
Change-Id: Ie07e2147ac9feed5ed6f53c9ae239532de8d8e86
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| df78b62811554ea82780525b3e3b484fe82303ce |
01-Nov-2011 |
Eric Fischer <enf@google.com> |
am a20e6bcd: Import revised translations.
* commit 'a20e6bcdc756c398b8688dc04ff82c56bd0900db':
Import revised translations.
|
| a20e6bcdc756c398b8688dc04ff82c56bd0900db |
01-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I0cb2ac4e0d2be9653f4d210eca07b07ab97962b9
es/values-be/strings.xml
es/values-et/strings.xml
|
| 250d36a914bfc53688f1ead7f4b48da793038fc8 |
31-Oct-2011 |
Ed Heyl <ed@google.com> |
Merge remote branch 'goog/ics-mr1' into ics-aah
|
| a7ca337e26f1f6490568b960e56288f5b728e162 |
28-Oct-2011 |
Ed Heyl <ed@google.com> |
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
|
| 1d557af66e0ba44eae39a7bf3878cf256fd8f136 |
26-Oct-2011 |
Andy McFadden <fadden@android.com> |
Move scheduled alarm scrub off main thread
We currently do a database update when the "boot completed" intent
is received. Doing it on the main thread appears to be causing ANRs,
so this moves it to a background thread. An "empty" service is
used to discourage the system from killing the provider while this
is in progress.
Also, removed an unused field from CalendarAlarmManager.
Bug 5262151
Change-Id: I8e5b1bd7782500e1827f43d7a453f824a1e7944c
ndroidManifest.xml
rc/com/android/providers/calendar/CalendarAlarmManager.java
rc/com/android/providers/calendar/CalendarReceiver.java
ests/src/com/android/providers/calendar/CalendarProvider2ForTesting.java
|
| 20afcb20352ef7c47297e91ddc5d5957bcada6af |
27-Oct-2011 |
Andy McFadden <fadden@android.com> |
Merge "Disallow empty eventTimezone values" into ics-mr1
|
| 82b6bf9d994d084fc8548279f3cf09eaae082430 |
27-Oct-2011 |
Andy McFadden <fadden@android.com> |
Disallow empty eventTimezone values
We now reject insert and update requests from apps that could result
in an Event with a null/empty eventTimezone column.
Bug 5514124
Change-Id: I119456aafd0c2af6e34b60f6a860cca056ac92f5
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 387535fec9f646e0b7acb82d5354f2b5ebee4395 |
27-Oct-2011 |
RoboErik <epastern@google.com> |
change COLOR_INDEX to COLOR_KEY
for https://android-git.corp.google.com/g/#/c/145200/
Change-Id: I90355ff4ed0ebebc7701dbec485087034e0ad338
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| a050e71d6f549cbfc8a95430c0065cb5daf159d9 |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
undo reset to ics-mr1 until we have a better method
|
| 523b021075c80160f656c4f3a08276f305a5de0e |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
reset to ics-mr1, but keep history
|
| e4e9ee0d5c8ba708ed4c56393150fb6aa1184c62 |
26-Oct-2011 |
RoboErik <epastern@google.com> |
am 2f251c77: Adds a Colors table to the db and updates events/cals tables
* commit '2f251c778c06d21ed7693a70f4a1268ff929242e':
Adds a Colors table to the db and updates events/cals tables
|
| 2f251c778c06d21ed7693a70f4a1268ff929242e |
18-Oct-2011 |
RoboErik <epastern@google.com> |
Adds a Colors table to the db and updates events/cals tables
This adds provider support for the new set of APIs being added
for colors. Adds allowedAvailability and allowedAttendeeType
to the Calendars table. Also removes old code for handling event
specific time zones before the server supported it.
Cherry pick of https://android-git.corp.google.com/g/#/c/143430/
Change-Id: I2e28350338657641f8a736bcedfbc1df92f5a5fd
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| fb3d57922df4fb0b033f561ab9c7cdf665787ea2 |
19-Oct-2011 |
Eric Fischer <enf@google.com> |
am 04174936: Merge "Import revised translations."
* commit '04174936d818d5adbfeea7ffd1a471bbd850df6b':
Import revised translations.
|
| 04174936d818d5adbfeea7ffd1a471bbd850df6b |
19-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
| d1a502cf0700fadee5d80c317649502c6deb486f |
19-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I9392f4cb2fd0e431af6765982f04afe339aecaaa
es/values-hi/strings.xml
es/values-iw/strings.xml
|
| 93abecd70364315e6e763776601f756b594f7d12 |
18-Oct-2011 |
Eric Fischer <enf@google.com> |
am afc3005d: (-s ours) am d0f9a05b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit 'afc3005d8fb27ed2c493b578bca7b4568fe0db9c':
Import revised translations. DO NOT MERGE
|
| afc3005d8fb27ed2c493b578bca7b4568fe0db9c |
18-Oct-2011 |
Eric Fischer <enf@google.com> |
am d0f9a05b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit 'd0f9a05bd4544089ba268964a4a9f02abad5a63e':
Import revised translations. DO NOT MERGE
|
| d0f9a05bd4544089ba268964a4a9f02abad5a63e |
18-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
|
| afcb146da68bcad8285517ab772f619e043fbc96 |
18-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
Change-Id: I5d23ca961e7287532f8789a497ddcafc02a9865c
es/values-hi/strings.xml
es/values-iw/strings.xml
|
| d65fed7abe57653e4609a2b83d7f82f794004e4e |
18-Oct-2011 |
Justin Ho <justinho@google.com> |
am 17b57651: am a82b321e: Updated app icon
* commit '17b576517cf492464b40c1b9322b11c801e3b245':
Updated app icon
|
| 17b576517cf492464b40c1b9322b11c801e3b245 |
18-Oct-2011 |
Justin Ho <justinho@google.com> |
am a82b321e: Updated app icon
* commit 'a82b321e944296be44ac98c1600261a8d9474c2d':
Updated app icon
|
| a82b321e944296be44ac98c1600261a8d9474c2d |
17-Oct-2011 |
Justin Ho <justinho@google.com> |
Updated app icon
Change-Id: Ib0f23028b01a4e80dbf86d6599466af89554f995
es/drawable-hdpi/app_icon.png
es/drawable-mdpi/app_icon.png
es/drawable-xhdpi/app_icon.png
|
| 72ac1187c53e09ff716cb4b9e60f86500e299729 |
15-Oct-2011 |
Andy McFadden <fadden@android.com> |
am f029d7c0: Fix StrictMode complaint
* commit 'f029d7c00095e8fff6963f301ca85196b61525e3':
Fix StrictMode complaint
|
| f029d7c00095e8fff6963f301ca85196b61525e3 |
14-Oct-2011 |
Andy McFadden <fadden@android.com> |
Fix StrictMode complaint
In some circumstances we were failing to close a cursor.
Bug 5443038
Change-Id: I2902214fb095a3fe8129d6ac14d87bc269c5e483
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 1729be623417af7ec6d9278495d086e6a4efe88b |
13-Oct-2011 |
Jeff Brown <jeffbrown@google.com> |
am aaa7f0dd: Remove references to ArrayListCursor which is deprecated.
* commit 'aaa7f0ddf94d402075572b43f39f1866407fbb3f':
Remove references to ArrayListCursor which is deprecated.
|
| aaa7f0ddf94d402075572b43f39f1866407fbb3f |
13-Oct-2011 |
Jeff Brown <jeffbrown@google.com> |
Remove references to ArrayListCursor which is deprecated.
Change-Id: Ib7981a40352cb1fe50a77cb800f83f98452b8488
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 9bf8868d67ef4c03c3562663a16317698cd70401 |
13-Oct-2011 |
Andy McFadden <fadden@android.com> |
am 1c72909a: Auto-update Events.hasAlarm
* commit '1c72909abbfe7559bcc880c339399f1eaa0478f3':
Auto-update Events.hasAlarm
|
| 1c72909abbfe7559bcc880c339399f1eaa0478f3 |
08-Oct-2011 |
Andy McFadden <fadden@android.com> |
Auto-update Events.hasAlarm
The "hasAlarm" column in the Events table is supposed to be read-only
for applications, updated automatically by the provider as reminders
are added and deleted. This wasn't implemented (the Calendar app was
doing it manually).
Bug 5424486
Change-Id: Id4d167fe081b77fbd514b9a700359fd84d9e43e8
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| f3627d091f01eb9c64c58f6551ce472ba2b651b1 |
07-Oct-2011 |
Andy McFadden <fadden@android.com> |
am 683c9db3: Improve restriction on selection
* commit '683c9db3f0a244969037a7f20767a35b3187ca4b':
Improve restriction on selection
|
| 56e358a34d0349255d568302a0a4d8127a8a8067 |
07-Oct-2011 |
Andy McFadden <fadden@android.com> |
am 24abf95c: Add URIs for updating Attendees and Reminders
* commit '24abf95cb69e8040af1a8dc2faace1bfb3ab505c':
Add URIs for updating Attendees and Reminders
|
| 683c9db3f0a244969037a7f20767a35b3187ca4b |
07-Oct-2011 |
Andy McFadden <fadden@android.com> |
Improve restriction on selection
The restrictions on whether or not "selection" should be specified
now also apply to deletion.
Added SYNCSTATE and EXTENDED_PROPERTIES to the list for which
selections are allowed.
Bug 5373449
Change-Id: I1c20d57cfa8401232555b90d53958f7a327be1f6
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 24abf95cb69e8040af1a8dc2faace1bfb3ab505c |
05-Oct-2011 |
Andy McFadden <fadden@android.com> |
Add URIs for updating Attendees and Reminders
Previously you could only update a single entry in Attendees or
Reminders, using the "/#" form of the URI. Now you can update
multiple entries by specifying a selection. (This is not something
apps will commonly want to do, but if nothing else it rounds out
the APIs.)
Also, merged common code for updates to Attendees, Reminders, and
ExtendedProperties.
Also, fixed a couple of minor bugs with updating an Attendee and
the associated Event.selfAttendeeStatus (e.g. event_id had to be
specified in the update values or the provider would NPE).
Bug 5373449
Change-Id: I72df47ece69bf083739970ffa48a213a2cf76704
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 360cdb4c65ac28d9433bec965ce075d27e8a3a63 |
03-Oct-2011 |
Andy McFadden <fadden@android.com> |
am cf71529b: Merge "Add new URI"
* commit 'cf71529b2b623c06bd68269ac9c875de7a53d259':
Add new URI
|
| cf71529b2b623c06bd68269ac9c875de7a53d259 |
03-Oct-2011 |
Andy McFadden <fadden@android.com> |
Merge "Add new URI"
|
| 4ceafc5518fa473af8e8c1f7d6b8ccbf3e9bf675 |
01-Oct-2011 |
Eric Fischer <enf@google.com> |
am 4ff4115d: Import revised translations.
* commit '4ff4115d6c18d106ab95bce57ec23cc3a88f525e':
Import revised translations.
|
| 4ff4115d6c18d106ab95bce57ec23cc3a88f525e |
01-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I89e74e787d1d43f620c5f8bcf9458d5841aa4803
es/values-sw/strings.xml
|
| fe1cb130bba78b36292a64d7c0bfb3292738973c |
29-Sep-2011 |
Andy McFadden <fadden@android.com> |
Add new URI
Add new "syncstate/#" URI.
Bug 5373449
Change-Id: Idb9ab70a51d4938e073cfc8c330b2028a8337810
rc/com/android/providers/calendar/CalendarProvider2.java
|
| e46e3a354f4b94de0aee3f9a19dc3eca5ced7456 |
28-Sep-2011 |
Andy McFadden <fadden@android.com> |
am 58993e87: Fix some calendar provider tests
* commit '58993e879a53f5454b36036da9799550f2ae0814':
Fix some calendar provider tests
|
| 58993e879a53f5454b36036da9799550f2ae0814 |
28-Sep-2011 |
Andy McFadden <fadden@android.com> |
Fix some calendar provider tests
Fixes:
- A caller of insertEvent() was failing because of the new checks
preventing both DURATION and DTEND from being set.
- testInsertOriginalTimezoneInExtProperties() was looking at the _id
field instead of event_id; this happened to work until Event._Id
was given the "autoincrement" attribute.
- internalTestDirty() was comparing the behavior of the dirty flag
when ExtendedProperties was altered by an app vs. by a sync
adapter. We no longer allow apps to alter this table.
Bug 5373449
Change-Id: I07db15541fba46b9c7dc11fa911cbb3c11bb5cc1
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 4803ee37df41a932be3fdf7dfc0209066d642bff |
28-Sep-2011 |
Andy McFadden <fadden@android.com> |
am f07b66b0: Restrict syncstate and extendedproperties URIs
* commit 'f07b66b00b0ee35bddc64a6f7ac4039627fbcf89':
Restrict syncstate and extendedproperties URIs
|
| f07b66b00b0ee35bddc64a6f7ac4039627fbcf89 |
28-Sep-2011 |
Andy McFadden <fadden@android.com> |
Restrict syncstate and extendedproperties URIs
Only sync adapters are allowed to use these URIs to make changes.
Bug 5373449
Change-Id: I1dbbda715b8da886a386da79a3618c6a88a6f14d
rc/com/android/providers/calendar/CalendarProvider2.java
|
| c1ba54e067c40e2f3afb455f63c54fd1be13b63f |
26-Sep-2011 |
Andy McFadden <fadden@android.com> |
am cad6bc94: Disambiguate INSTANCES_SEARCH query
* commit 'cad6bc946434363f6ba6fed58bfa818cd6736d21':
Disambiguate INSTANCES_SEARCH query
|
| cad6bc946434363f6ba6fed58bfa818cd6736d21 |
23-Sep-2011 |
Andy McFadden <fadden@android.com> |
Disambiguate INSTANCES_SEARCH query
The unqualified "_id" reference in the GROUP BY portion was
confusing sqlite.
Also, commented on a few things.
Bug 5366218
Change-Id: I8429af45306f93837679e0b28e4b0f97cb4fa3ea
rc/com/android/providers/calendar/CalendarCache.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 13e3acd209d96286854b766410e11f13fe8492b6 |
22-Sep-2011 |
Andy McFadden <fadden@android.com> |
am 7ca196b9: Fix instructions
* commit '7ca196b92f98ad691f8d55313667c9b476391942':
Fix instructions
|
| 7ca196b92f98ad691f8d55313667c9b476391942 |
22-Sep-2011 |
Andy McFadden <fadden@android.com> |
Fix instructions
Change-Id: Idc39e8875c1d17d39b09618a4e4c678a4f5f8a50
ests/EMMA_README
|
| bee6d273d92221581c2b2d1549702f0d354b563d |
21-Sep-2011 |
Eric Fischer <enf@google.com> |
am a104169f: (-s ours) am 7e52c21d: (-s ours) Import revised translations. DO NOT MERGE
* commit 'a104169ffadfad132c463c2666a05becb1f61586':
Import revised translations. DO NOT MERGE
|
| a104169ffadfad132c463c2666a05becb1f61586 |
21-Sep-2011 |
Eric Fischer <enf@google.com> |
am 7e52c21d: (-s ours) Import revised translations. DO NOT MERGE
* commit '7e52c21dbc294486194709fecb2a8c31eac06274':
Import revised translations. DO NOT MERGE
|
| 7e52c21dbc294486194709fecb2a8c31eac06274 |
21-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
Change-Id: I5b997cd8e0d0f83927ea5d61df0e253a96e520f7
es/values-sw/strings.xml
|
| a84d476c05eaade2995fb97f6ad016320cdca59c |
20-Sep-2011 |
Eric Fischer <enf@google.com> |
am c0dabaaf: Import revised translations.
* commit 'c0dabaaf38e4a949ff4122fc1318f6328e943a8a':
Import revised translations.
|
| c0dabaaf38e4a949ff4122fc1318f6328e943a8a |
20-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I97198d1dd37830e7eeb090c8aabf1d93887f7c11
es/values-af/strings.xml
es/values-am/strings.xml
es/values-in/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
| 84847547b383c5e83ab6beeebb135235428c8446 |
17-Sep-2011 |
Eric Fischer <enf@google.com> |
am a4fb50e4: (-s ours) am 9a7ce021: (-s ours) Import revised translations. DO NOT MERGE
* commit 'a4fb50e47959fb6f6f8cebc32d6c13c1bdf9d7d3':
Import revised translations. DO NOT MERGE
|
| a4fb50e47959fb6f6f8cebc32d6c13c1bdf9d7d3 |
17-Sep-2011 |
Eric Fischer <enf@google.com> |
am 9a7ce021: (-s ours) Import revised translations. DO NOT MERGE
* commit '9a7ce0211a00a6290599dab3bba1e3c2d276a9aa':
Import revised translations. DO NOT MERGE
|
| 9a7ce0211a00a6290599dab3bba1e3c2d276a9aa |
17-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
Change-Id: I999bcaf2168c3268f3c19834322945a5773592a9
es/values-af/strings.xml
es/values-am/strings.xml
es/values-in/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
| 73b6e9d61d367fb7796aba238eba01755e3074a3 |
12-Sep-2011 |
Eric Fischer <enf@google.com> |
am f0ae85cc: Import revised translations.
* commit 'f0ae85cc9984f843c55750680d194d5b74827cd6':
Import revised translations.
|
| f0ae85cc9984f843c55750680d194d5b74827cd6 |
12-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I01f5dfccf2642a1424e13d587b47d4c5c8f1015d
es/values-nb/strings.xml
|
| 7e5d7ad96bd3eeb0d2eb69defe6b66fc4cec2e95 |
06-Sep-2011 |
Eric Fischer <enf@google.com> |
am ee9b907a: Import revised translations.
* commit 'ee9b907a39b249f8ae4e53e3dd7641ee6542e3dd':
Import revised translations.
|
| ee9b907a39b249f8ae4e53e3dd7641ee6542e3dd |
03-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I4f0a70c1978457479a1fe0fa62f6041d00838f77
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-fa/strings.xml
es/values-hr/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
| 612ff231f2952b1121194588e7f35dffd96c4af7 |
01-Sep-2011 |
Andy McFadden <fadden@android.com> |
am e1ef10b7: Set android:exported="false" on some entries
* commit 'e1ef10b7d5ee4c0d4dc0a470591ada0740321f38':
Set android:exported="false" on some entries
|
| e1ef10b7d5ee4c0d4dc0a470591ada0740321f38 |
31-Aug-2011 |
Andy McFadden <fadden@android.com> |
Set android:exported="false" on some entries
Reduce the visibility of some intents.
Bug 2761308
Change-Id: I5a3a6143e44d8a9bbdf07c44f34e4745c594816c
ndroidManifest.xml
|
| 1dd5f417ecabe1d625f98b5abf917ee84df28f49 |
27-Aug-2011 |
Eric Fischer <enf@google.com> |
am eb1b0822: Import revised translations.
* commit 'eb1b0822d7012fb07a469ea79696170cc45b83d2':
Import revised translations.
|
| eb1b0822d7012fb07a469ea79696170cc45b83d2 |
27-Aug-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I58a553673d3e1fbeef77eb261c3ea238c0fef42e
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
| d2436314367e784c8f65447db0daf3b7929c812c |
23-Aug-2011 |
Dianne Hackborn <hackbod@google.com> |
am 86c22e9a: Add boot message when upgrading database.
* commit '86c22e9a05df0848da465b9a43da6b1350da4dc5':
Add boot message when upgrading database.
|
| 86c22e9a05df0848da465b9a43da6b1350da4dc5 |
22-Aug-2011 |
Dianne Hackborn <hackbod@google.com> |
Add boot message when upgrading database.
Change-Id: I33c880714f6e3da4a726d8890a64944f9e8953ba
es/values/strings.xml
rc/com/android/providers/calendar/CalendarUpgradeReceiver.java
|
| 5aef15f26b3bb49e449c50175dc304102a5e8d16 |
22-Aug-2011 |
Eric Fischer <enf@google.com> |
am f50540f4: Merge "Import revised translations."
* commit 'f50540f4b89e0facd154c09c1d56092ff0a3a64e':
Import revised translations.
|
| f50540f4b89e0facd154c09c1d56092ff0a3a64e |
22-Aug-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
| 17b65ac7f725cf29a0b233063a9cfdff61fcf850 |
22-Aug-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: If855d88fc59c5705ce8460fe71aa873b05c619fb
es/values-iw/strings.xml
|
| 9513fb401756a82eff0d755666009926209c7a80 |
19-Aug-2011 |
Andy McFadden <fadden@android.com> |
am 64af0028: Handle onAccountsUpdated off the main thread
* commit '64af00286ccc989f390f7f43153688d4173ac62d':
Handle onAccountsUpdated off the main thread
|
| 64af00286ccc989f390f7f43153688d4173ac62d |
19-Aug-2011 |
Andy McFadden <fadden@android.com> |
Handle onAccountsUpdated off the main thread
The AccountManager is posting onAccountsUpdated to the main thread.
We want to handle it on a separate thread.
Bug 5103871
Change-Id: Ieda5651b0dabd19cc97394ae2a690ca2be237b9a
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 1a42d5b5eb722753ec436b02c1d7c7ec7c1c1e3d |
19-Aug-2011 |
Andy McFadden <fadden@android.com> |
am 8893c66c: Remove testEntityQuery
* commit '8893c66c9d038d1d717b3df60ea74e0d732e5cdf':
Remove testEntityQuery
|
| 8893c66c9d038d1d717b3df60ea74e0d732e5cdf |
19-Aug-2011 |
Andy McFadden <fadden@android.com> |
Remove testEntityQuery
An equivalent test now lives in CTS. The test here makes some
assumptions about event IDs that are not valid with autoincrement,
so I'm just removing it.
Bug 5086664
Change-Id: I6a56152ca8c5d45d246ad5affbba03848db3dc63
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 104c0936f9bd19004d058035ff312640f57aa660 |
18-Aug-2011 |
Andy McFadden <fadden@android.com> |
am 3b7c1cc2: Update provider for EMMA from CTS
* commit '3b7c1cc29240628ed0f61b26375eba21665fe6d7':
Update provider for EMMA from CTS
|
| 3b7c1cc29240628ed0f61b26375eba21665fe6d7 |
05-Aug-2011 |
Andy McFadden <fadden@android.com> |
Update provider for EMMA from CTS
The provider now accepts a "secret" request to dump EMMA coverage
data.
The commands in tests/EMMA_README were updated for the new world
order, in which the tests live in CTS rather than being one with
the provider itself. This also converts the commands from direct
execution to a shell function, and adds a second function that can
be used to de-EMMA the provider.
Bug 2361048
Change-Id: I38b494cc65a15523207f95d2e622756cc393b665
rc/com/android/providers/calendar/CalendarProvider2.java
ests/EMMA_README
|
| cd2a53a3cd0424810964a706e1730b202a1c4c21 |
17-Aug-2011 |
Andy McFadden <fadden@android.com> |
am 9f97cde4: Don\'t reject updates to malformed events
* commit '9f97cde4a34eb814b2e14f694c349c5ad6003a6d':
Don't reject updates to malformed events
|
| 9f97cde4a34eb814b2e14f694c349c5ad6003a6d |
17-Aug-2011 |
Andy McFadden <fadden@android.com> |
Don't reject updates to malformed events
We want to prevent apps from inserting bad data into the database,
but we need to be a bit more lenient when the bad data is already
present. When processing an update, we now only validate the merged
data if the original event looks okay.
Bug 5173841
Change-Id: Id5ec755eb0d8ef6e96a9d67857b4c5dbb2ef4741
rc/com/android/providers/calendar/CalendarProvider2.java
|
| ee45418851e9c13145c1a784a4bea2a3a230e3f8 |
17-Aug-2011 |
Andy McFadden <fadden@android.com> |
am 222f23bb: Fix backfill of _sync_id
* commit '222f23bb26b6a72a9a0725593f456cfe497f7e91':
Fix backfill of _sync_id
|
| 222f23bb26b6a72a9a0725593f456cfe497f7e91 |
17-Aug-2011 |
Andy McFadden <fadden@android.com> |
Fix backfill of _sync_id
If we receive an exception to a recurring event before we receive
the event, we back-fill the originalSyncId when the event finally
arrives. The sql command that did this wasn't specifying the
calendar, which caused problems when different calendars had
(unrelated) events with identical _sync_ids.
Bug 5137544
Change-Id: I63d1eb4f531aa59044c93418e0c6d4828918b156
rc/com/android/providers/calendar/CalendarProvider2.java
|
| dae17bdfbb49e4fa25da14cff0e1db0b191dda98 |
05-Aug-2011 |
Andy McFadden <fadden@android.com> |
am df44eb18: Move Calendar provider tests to CTS
* commit 'df44eb186c7c227a7faecd5f7836e34983a1509c':
Move Calendar provider tests to CTS
|
| df44eb186c7c227a7faecd5f7836e34983a1509c |
05-Aug-2011 |
Andy McFadden <fadden@android.com> |
Move Calendar provider tests to CTS
The CalendarCts tests now live in CTS.
Bug 2361048
Change-Id: Id25e0fbd4f08b3679b18a45729ea820cb2fd7231
ests/src/com/android/providers/calendar/CalendarCts.java
|
| deddff89a7930fef30565c59d51ae096d652135e |
05-Aug-2011 |
Andy McFadden <fadden@android.com> |
am b843cb1b: Merge "Test null projections"
* commit 'b843cb1b172f1e0ff870162e5d269d721c294f20':
Test null projections
|
| b843cb1b172f1e0ff870162e5d269d721c294f20 |
05-Aug-2011 |
Andy McFadden <fadden@android.com> |
Merge "Test null projections"
|
| 3cedef30d3e985b737a75f3e732515507a983cc4 |
05-Aug-2011 |
Andy McFadden <fadden@android.com> |
am 9b36b09b: Merge "Comment out failing assert"
* commit '9b36b09b8dcf2345ded00a7f5a6cac41f42d0d52':
Comment out failing assert
|
| 9b36b09b8dcf2345ded00a7f5a6cac41f42d0d52 |
05-Aug-2011 |
Andy McFadden <fadden@android.com> |
Merge "Comment out failing assert"
|
| 76c7786ab8a6f035f1e58eea8ebe62e91ddfa7eb |
05-Aug-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 4b2d5675: Reconcile with gingerbread-release gingerbread-mr4-release
* commit '4b2d56758de73824b9e3e58cbcc3f9f6f61e7a2b':
DO NOT MERGE - Avoid re-use of orphaned data
|
| 4b2d56758de73824b9e3e58cbcc3f9f6f61e7a2b |
05-Aug-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with gingerbread-release gingerbread-mr4-release
Change-Id: I8e15abd3f33eecd285c108257dd4d89ee6b1423f
|
| 1e7f0387b0023df9a6d79e1ed9611f82f67637e9 |
05-Aug-2011 |
Andy McFadden <fadden@android.com> |
Comment out failing assert
The test is failing, but it's not something we're going to fix for
this release, so we don't want it throwing exceptions in CTS.
Bug 2361048
Change-Id: I5a8336836cd4805438e8b3585cdbee244b8e88b9
ests/src/com/android/providers/calendar/CalendarCts.java
|
| 361695206f7a25577ddc374f20868105cae531cd |
03-Aug-2011 |
Andy McFadden <fadden@android.com> |
Test null projections
This adds a test that issues various queries with null projections
to confirm that the database structure matches expectations.
This also fixes the Reminders projection.
Bug 4878015
Change-Id: I1acdd35699d0132eadec3b13abe8011449f764d5
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCts.java
|
| 2877459eb48881a55a709f11d4a65134fc13f7c8 |
04-Aug-2011 |
Andy McFadden <fadden@android.com> |
am bf986d8d: Correct allowedReminders defaults
* commit 'bf986d8deeeed9566e0badeba89d4800533cbca6':
Correct allowedReminders defaults
|
| bf986d8deeeed9566e0badeba89d4800533cbca6 |
04-Aug-2011 |
Andy McFadden <fadden@android.com> |
Correct allowedReminders defaults
This reduces the default set of allowed reminders to {default,alert},
and adds an upgrade step that expands the set to include email when
the calendar is a Google calendar.
Bug 5117661
Change-Id: I094858b16cc1f0ca8bd0aefd48124997079800b3
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 99ed2b0c2a5004a1920b4340f30a996cd06d2cba |
03-Aug-2011 |
Andy McFadden <fadden@android.com> |
am 85c09a31: Clear duration when creating exception
* commit '85c09a31bcc3a18e173428bf7b628cec2834bebc':
Clear duration when creating exception
|
| 85c09a31bcc3a18e173428bf7b628cec2834bebc |
03-Aug-2011 |
Andy McFadden <fadden@android.com> |
Clear duration when creating exception
When creating a single-instance exception to a recurring event,
we're expecting to have a DTEND but no DURATION. We were
neglecting to clear DURATION.
Also, don't act as a sync adapter when creating an exception in
the non-sync-adapter test.
Bug 5116044
Change-Id: I16d4e927cb1876a636ec9d6b0c2736df4a25af23
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCts.java
|
| 1526004ae564f492a5394532e1bca38e821d073e |
30-Jul-2011 |
Andy McFadden <fadden@android.com> |
DO NOT MERGE - Avoid re-use of orphaned data
Data is being added to Attendees and Reminders that is associated
with delete Events. When the Event ID is re-used, the orphaned
data attaches to the new event. To avoid this, change the Event
ID column to "autoincrement", ensuring that IDs are never re-used.
At database upgrade time, delete any orphaned rows.
Bug 5063315
Change-Id: Ic2519b335d6d6b2c82579c5484ad3b8528ffd682
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 0e6f23883a6497d5017573c13d0a07311caeb440 |
03-Aug-2011 |
Andy McFadden <fadden@android.com> |
am 03138eb7: Merge "Allow multi-rule RRULEs"
* commit '03138eb7b9359e9f99fffbe285cf584f23038e7e':
Allow multi-rule RRULEs
|
| 03138eb7b9359e9f99fffbe285cf584f23038e7e |
03-Aug-2011 |
Andy McFadden <fadden@android.com> |
Merge "Allow multi-rule RRULEs"
|
| 5ce2a67ba623d3a32a2aa3bb70c5ded7e8fd7b5b |
02-Aug-2011 |
Andy McFadden <fadden@android.com> |
Allow multi-rule RRULEs
We have partial support for events with multiple RRULEs, which
arrive as a single RRULE entry with elements separated by '\n'.
This updates the RRULE validation code to accept these.
Bug 4749046
Change-Id: I1045e1cc41f9c83522282caa643781a2448270c0
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCts.java
|
| 67091e19d69012cc5ac08f2cd12dc23e4b3bf002 |
02-Aug-2011 |
Andy McFadden <fadden@android.com> |
am 4b9f67cd: Don\'t re-use scrubbed mod values
* commit '4b9f67cdc442ba0caa5bb007a4e0dfd3594ef945':
Don't re-use scrubbed mod values
|
| 4b9f67cdc442ba0caa5bb007a4e0dfd3594ef945 |
02-Aug-2011 |
Andy McFadden <fadden@android.com> |
Don't re-use scrubbed mod values
The "scrub" code was changed so that it added explicit null
assignments to the values-to-be-updated set. This is fine for
single updates, but for multi-event updates (which happen during
the initial sync) we were nulling out stuff in later events. With
this change we make a copy of the set before modifying it.
Bug 2519655
Change-Id: Ib62a267bf6a45b57c85685e439ae4100487dd9df
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 3add81d29f770dcb5946fc654a87ada84aeb47cb |
02-Aug-2011 |
Andy McFadden <fadden@android.com> |
am 4b8d56f3: (-s ours) am 84ee8a53: (-s ours) am 7513477e: (-s ours) am e95136a8: DO NOT MERGE - Avoid re-use of orphaned data
* commit '4b8d56f381eac43fb8f62f1492054066e649dc04':
DO NOT MERGE - Avoid re-use of orphaned data
|
| 48c8bddd6011237c79f54afd3164dfbfe1e7ebfa |
02-Aug-2011 |
Andy McFadden <fadden@android.com> |
am 540e1ab5: (-s ours) am 989d50bd: (-s ours) DO NOT MERGE - Avoid re-use of orphaned data
* commit '540e1ab5f55373b7c9e7019110932b9de7107e05':
DO NOT MERGE - Avoid re-use of orphaned data
|
| 4b8d56f381eac43fb8f62f1492054066e649dc04 |
02-Aug-2011 |
Andy McFadden <fadden@android.com> |
am 84ee8a53: (-s ours) am 7513477e: (-s ours) am e95136a8: DO NOT MERGE - Avoid re-use of orphaned data
* commit '84ee8a53e429f6d1db2a6bdc856406b72a2620df':
DO NOT MERGE - Avoid re-use of orphaned data
|
| 540e1ab5f55373b7c9e7019110932b9de7107e05 |
02-Aug-2011 |
Andy McFadden <fadden@android.com> |
am 989d50bd: (-s ours) DO NOT MERGE - Avoid re-use of orphaned data
* commit '989d50bd95b45755adc09facdf53e4218cf10077':
DO NOT MERGE - Avoid re-use of orphaned data
|
| 84ee8a53e429f6d1db2a6bdc856406b72a2620df |
02-Aug-2011 |
Andy McFadden <fadden@android.com> |
am 7513477e: (-s ours) am e95136a8: DO NOT MERGE - Avoid re-use of orphaned data
* commit '7513477e5e4afdc32f0cf5e19da08da84c5d9533':
DO NOT MERGE - Avoid re-use of orphaned data
|
| 7513477e5e4afdc32f0cf5e19da08da84c5d9533 |
02-Aug-2011 |
Andy McFadden <fadden@android.com> |
am e95136a8: DO NOT MERGE - Avoid re-use of orphaned data
* commit 'e95136a83571913a7d8a41488b51cada634663ea':
DO NOT MERGE - Avoid re-use of orphaned data
|
| be4ac5fac63f1619df46977891a6b4a3a0e02563 |
02-Aug-2011 |
Andy McFadden <fadden@android.com> |
Scrub some, validate others
The previous behavior of the Calendar provider was to scrub all
new events. This was changed to scrub and validate all new events
and all updates. This now changes it again: we now scrub new events
and updates that originate from a sync adapter, and validate new
events and updates that come from an application.
The idea is to retain compatibility with the sync adapters while
clamping down on apps.
Bug 2519655
Change-Id: I792ed1db126947ae99a6e97f81e9f2380dfa1a7f
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 7544af675ce2fd78f33198e5e9194f2bc7bd129f |
01-Aug-2011 |
Andy McFadden <fadden@android.com> |
Recognize new-old database versions
Correcting the orphaned Attendees / Reminders issue in older
releases required introducing new database versions. We need to
recognize these.
Bug 5063315
Change-Id: Ibd1af65c5f24728f3b73a3b33ce529bbca010799
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| e95136a83571913a7d8a41488b51cada634663ea |
30-Jul-2011 |
Andy McFadden <fadden@android.com> |
DO NOT MERGE - Avoid re-use of orphaned data
Data is being added to Attendees and Reminders that is associated
with delete Events. When the Event ID is re-used, the orphaned
data attaches to the new event. To avoid this, change the Event
ID column to "autoincrement", ensuring that IDs are never re-used.
At database upgrade time, delete any orphaned rows.
Bug 5063315
Change-Id: Ic2519b335d6d6b2c82579c5484ad3b8528ffd682
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 989d50bd95b45755adc09facdf53e4218cf10077 |
31-Jul-2011 |
Andy McFadden <fadden@android.com> |
DO NOT MERGE - Avoid re-use of orphaned data
Data is being added to Attendees and Reminders that is associated
with delete Events. When the Event ID is re-used, the orphaned
data attaches to the new event. To avoid this, change the Event
ID column to "autoincrement", ensuring that IDs are never re-used.
At database upgrade time, delete any orphaned rows.
Bug 5063315
(cherry-pick from hc-mr2)
Change-Id: I06f42205bd5e6720f877e797fa830e720423a424
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 935132618f821883f101db31af24e6d4c2b1e82c |
29-Jul-2011 |
Andy McFadden <fadden@android.com> |
Avoid re-use of orphaned data
Data is being added to Attendees and Reminders that is associated
with delete Events. When the Event ID is re-used, the orphaned
data attaches to the new event. To avoid this, change the Event
ID column to "autoincrement", ensuring that IDs are never re-used.
At database upgrade time, delete any orphaned rows.
Bug 5063315
Change-Id: I02051bf271ea9b9fd05c27e50f546177f42f43d0
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 499287f0ccd3f20f8cf5f9007a9b422b825a7b7c |
29-Jul-2011 |
Andy McFadden <fadden@android.com> |
Fix fixAllDayTime
The code was incorrectly assuming the value was present.
Bug 5093896
Change-Id: I7741a03b96d5c7bff6307c67a61d08014a52cb85
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCts.java
|
| 498b6fa6ba6f2deea21aa8855705f572a8181b1d |
28-Jul-2011 |
Andy McFadden <fadden@android.com> |
Merge "Scrub more data"
|
| 62fb6911ea17d10de9662f455983ea045324aa62 |
28-Jul-2011 |
Andy McFadden <fadden@android.com> |
Scrub more data
In certain circumstances, the sync adapter is issuing an update that
sets DURATION on an Event that already has DTEND, which makes the
validation code upset. This change modifies the "scrub" method so
it can be used with the update code as well.
Bug 2519655
Change-Id: Id9d5af0d76f3416e906311a5ad13c5ca3229eb74
rc/com/android/providers/calendar/CalendarProvider2.java
|
| d35e5b4423692b7b495ef31c390c1796e3c3651b |
27-Jul-2011 |
Michael Chan <mchan@android.com> |
Merge "b/5064464 Fixed the problem where the attendee and reminder queries were returning dups."
|
| ef1f983b14a586f579a0d2978a0b0ccc2fcc425c |
27-Jul-2011 |
Michael Chan <mchan@android.com> |
b/5064464 Fixed the problem where the attendee and reminder queries
were returning dups.
Change-Id: I6e1c71086d765aec5b87b19171ebdf0228795e9e
rc/com/android/providers/calendar/CalendarProvider2.java
|
| d5be35c42732d610040a64dd5bab782ef10014ab |
23-Jul-2011 |
Andy McFadden <fadden@android.com> |
Change the way event updates are handled
The previous implementation went to great lengths to avoid hitting
the database any more than necessary. Because event updates may
only be touching a handful of fields, this required handling a
variety of situations in which only partial data was available.
In some cases a few fields were queried from the database.
We want to validate requests more robustly as part of opening the
calendar provider, so we now pull the events out of the database,
merge them with the new values, and validate the result before
issuing the update.
"Bulk" updates are no longer issued as a single database command
(though they do all happen within a single transaction). Each event
update is validated individually. As a result, the partial-update
mechanism may be applied to events edited in bulk.
This doesn't introduce any new validation tests, but some of the
existing tests are now applied more broadly, so there is some risk of
previously-accepted requests being rejected.
The validateEventData() function was split into two parts. The code
that dealt with bad requests by stripping out undesirable fields
is now in scrubEventData(). Long-term we want to eliminate the
"scrub" pass.
Also, fixed the code that updates LAST_DATE in an update transaction
so that changing from a regular event or limited recurrence to an
infinitely-repeating recurrence causes LAST_DATE to be nulled out.
Bug 2519655,5057401
Change-Id: Ic5c510951334a11adb8bdc58c01d863bcf8bc01a
rc/com/android/providers/calendar/CalendarInstancesHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCts.java
|
| 2979774dee159a310a58d5e256b300a9d33de7f0 |
26-Jul-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I627b46a144c52f2da2c2e4c4758628c304b4717a
es/values-zu/strings.xml
|
| ba54f5f9ca0c33fd518b1c87bb15fb7907672e04 |
15-Jul-2011 |
Andy McFadden <fadden@android.com> |
Verify RRULEs before adding to database
We check before adding a new event (either wholly new or an
exception to an existing recurrence) or updating an existing event.
Bug 4749046
Change-Id: If3ed6ef3d3481ecbe9638b15d686d66edb3c7995
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCts.java
|
| 4d10d2da7bef342c2f5dcbfd91cc51a569a3998f |
15-Jul-2011 |
Andy McFadden <fadden@android.com> |
Delete exceptions when recurring event is deleted
When a recurring event is deleted:
If the event has been synced with the server:
Delete exceptions that have not been synced
If the event has NOT been synced:
Delete all exceptions
Bug 4901765
Change-Id: I515aab647e6085289185de6913763e8b40fbca62
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 78c7a50da020245c19b016ca19213be8f04aa30e |
14-Jul-2011 |
Andy McFadden <fadden@android.com> |
Remove calendar-common from test makefile
The test jar doesn't need it, and Dalvik gets confused when there's
two copies of the same classes from different places.
Change-Id: Id0eaa419edb2c577cf3be30d05a3876503a1ded6
ests/Android.mk
|
| bf61571797b7b6a390d35f16aad7765ea348e5ae |
13-Jul-2011 |
Andy McFadden <fadden@android.com> |
Move a couple more classes to calendar-common
Move RecurrenceProcessor and DateException, so that app code can
access the recurrence generator. Useful for e.g. bug 4977517.
Change-Id: Id52f51873da0c4214333e17ed3a70987e0f40340
rc/com/android/providers/calendar/CalendarInstancesHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/DateException.java
rc/com/android/providers/calendar/Duration.java
rc/com/android/providers/calendar/RecurrenceProcessor.java
ests/src/com/android/providers/calendar/DurationTest.java
ests/src/com/android/providers/calendar/RRuleTest.java
ests/src/com/android/providers/calendar/RecurrenceProcessorTest.java
|
| 93e0bbb921cce7a5cec355521bc570c03c9d6a1c |
07-Jul-2011 |
Andy McFadden <fadden@android.com> |
Relocate common Calendar classes
Move some classes from android.pim to com.android.calendarcommon.
Bug 4575374
Change-Id: I3cb6a59bf761b97973c2590f71bdf8e28575adb0
ndroid.mk
rc/com/android/providers/calendar/CalendarInstancesHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/RecurrenceProcessor.java
ests/Android.mk
ests/src/com/android/providers/calendar/ICalendarTest.java
ests/src/com/android/providers/calendar/RRuleTest.java
ests/src/com/android/providers/calendar/RecurrenceProcessorTest.java
ests/src/com/android/providers/calendar/RecurrenceSetTest.java
|
| 32aa776d04075be5b5c945c68f7f352f4a3038b7 |
08-Jul-2011 |
Andy McFadden <fadden@android.com> |
Correctly split recurring events that have COUNT
The code that splits recurring events for "this and all future"
edits was always adding an UNTIL part. This didn't work right
when the original event had a COUNT part.
Bug 4977517
Change-Id: I7960e24fbd0fdfc67de45cced1f26200544706a4
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCts.java
|
| 77e53e0abfa609e3686ee02807d42e2b4a365ed9 |
30-Jun-2011 |
Andy McFadden <fadden@android.com> |
Merge "Tweak instance generation"
|
| 744fa975b40b24ea7377c0e273f60a7a4d47e2e0 |
30-Jun-2011 |
RoboErik <epastern@google.com> |
Updates for api comments
Change-Id: Idb9400d43b52664857ee78835ad1f4231eca7b75
rc/com/android/providers/calendar/CalendarAlarmManager.java
rc/com/android/providers/calendar/CalendarDebug.java
ests/src/com/android/providers/calendar/CalendarCts.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| b09eb917f2490a1dae20709a667df845a2e67c94 |
28-Jun-2011 |
Andy McFadden <fadden@android.com> |
Tweak instance generation
The code that regenerates the Instances table understands _sync_id
and originalSyncId, but is generally unaware of originalId.
This isn't a supported mode of operation for the app -- you're not
allowed to create a recurrence exception until after the event has
been synchronized with the server -- but you can hit it with the
provider's exception creation URI.
This change doesn't fix the problem, but does take a step toward it.
In particular:
- Deletion of existing instances is now correct. This may be more
visually jarring than the previous approach when creating
exceptions in airplane mode: instead of seeing a doubled-up event,
you'll see the original event vanish (it adds an instance for
the exception, but can't find the recurrence).
- isRecurrenceEvent() now recognizes an event with a non-empty
originalId as a recurrence exception.
- Some stuff in updateRecurrenceInstancesLocked() was hitting the
database, some was assuming that values were in the set of goodies
passed in. This was potentially wrong for event updates, which
could have a partial set of goodies.
- The exception creation URI code now only updates the affected
Instances entries, instead of blowing away the entire table.
Two new tests have been added to exercise the various paths through
the instance regeneration code.
Also, adjusted the code that updates the Attendees table when an
exception changes selfAttendeeStatus to be more tolerant of transient
situations.
Bug 4473786
Change-Id: Ibd409373be002e71d5709ee1c17eb16976481ce2
rc/com/android/providers/calendar/CalendarInstancesHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCts.java
|
| c832113820b3fe514077b45dc4daaae970ef3284 |
24-Jun-2011 |
Andy McFadden <fadden@android.com> |
Feature + exception fixes in CalendarProvider
New feature: if selfAttendeeStatus is updated when creating an
exception for a recurring event, the provider will automatically update
the "status" columns in the appropriate Attendees rows. (Normally this
goes the other direction, where updates to the Attendees table are
mirrored into Events.)
Added some test code to exercise it (though we're still not verifying
changes to Attendees).
Fix: the exception creation code was mis-handling the start date. This
didn't show up in testing because the tests were creating exceptions
with modified start dates.
Fix: the tests now fiddle with the duration rather than the start date,
so that problems like the above are visible.
Fix: don't allow DTEND to be specified in exception creation. This
value is automatically generated from originalInstanceTime + duration.
Also added two recent SYNC_DATA fields to the "don't copy" list.
Fix: set the dirty flag on exception events so the server will see them
(unless the creator is the sync adapter). Note the CTS tests do most
of their work claiming to be the sync adapter, so this doesn't really
show up there.
Bug 2664212
Change-Id: Iab43171926ee51a5ba0f9193830aa97b9b4fc147
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCts.java
|
| bee24e71d750c9926a05a72c1ee9987434ba81bf |
24-Jun-2011 |
RoboErik <epastern@google.com> |
Turn off EMMA build flag when done building report
Change-Id: I6e7ab44df2e72ae5dab03f04091b5af70a413de6
ests/EMMA_README
|
| 45f18d759c5f45a856e1ab709856d5d238d4468f |
24-Jun-2011 |
RoboErik <epastern@google.com> |
api comment fixes
Change-Id: Ica45a14f4d5b484351a4b79b260687d959843fdd
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 4caf8d015918f619a67d321a152f150a01022717 |
23-Jun-2011 |
Andy McFadden <fadden@android.com> |
There can be only one MetaData
Instead of creating a new MetaData in CalendarInstancesHelper, use
the one created by CalendarProvider2.
Bug 4815094
Change-Id: I88633e4694e7879efaad601536e84cab2bc96e8d
rc/com/android/providers/calendar/CalendarInstancesHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/MetaData.java
ests/EMMA_README
|
| f29b16832bf4a14eb83ea367134962eb2a42e4e7 |
20-Jun-2011 |
Andy McFadden <fadden@android.com> |
Remove old EventRecurrenceTest.
It's now part of coretests.
Change-Id: Iaced637403e1173d85243fa69c7271c357147d73
ests/src/com/android/providers/calendar/EventRecurrenceTest.java
|
| c89d8f393608d2646fb4584762c05b8abf6263cd |
21-Jun-2011 |
RoboErik <epastern@google.com> |
Merge "Add a readme for generating code coverage"
|
| a416a9b84c63679b1a84d3a57926afcc5b66fa93 |
21-Jun-2011 |
RoboErik <epastern@google.com> |
Add a readme for generating code coverage
Change-Id: Ie124796ccbe5d200fe27a00a33d1d8228eab617c
ests/EMMA_README
|
| 2293dbea1d3dc7a49efb9ebb0501ea34bbf66f4e |
21-Jun-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I152abc14a8855dd4cdbe9cdbd96cf81f0aade9a2
es/values-da/strings.xml
es/values-ms/strings.xml
|
| 8b8bfc28f364749ace6c453907ac65a6ea60b8e4 |
15-Jun-2011 |
RoboErik <epastern@google.com> |
Merge "Ensure new events have a calendar_id"
|
| 95229b60087d6c25f80bbcdebf47ac110c01df68 |
15-Jun-2011 |
RoboErik <epastern@google.com> |
Ensure new events have a calendar_id
Change-Id: I85f10885f1ba0d22d2be02b8673614b1c1a734f1
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 470aa5bc291ca33d51dda356f38ac2954026da9a |
13-Jun-2011 |
Alon Albert <aalbert@google.com> |
Upgrade database for GData 2 & Partial Update for Google accounts.
* Change event id's from ".../private/full/... to .../events/...
* Set Calendars.canPartiallyUpdate to 1 to support partial updates
* Nuke sync state so we re-sync with a fresh etag and edit url
Also re-add DIRTY to sEventEntitiesProjectionMap after it was dropped
by accident in a previous CL.
Change-Id: Ic3fed903c76ce94fb2b60ba746f4bd31b3df23f4
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| b9644fe24edf9e25f0b21c1394e88d25070e0238 |
14-Jun-2011 |
RoboErik <epastern@google.com> |
Rename Calendar.java to CalendarContract.java
Change-Id: Iecdf0141d6baeed4a93b4f219a72f7ed8a5b9ff3
rc/com/android/providers/calendar/CalendarAlarmManager.java
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarDebug.java
rc/com/android/providers/calendar/CalendarInstancesHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/MetaData.java
rc/com/android/providers/calendar/SQLiteContentProvider.java
ests/src/com/android/providers/calendar/CalendarCts.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
ests/src/com/android/providers/calendar/RecurrenceSetTest.java
|
| c64ed6bf617167c73b3e036790a5e640bee725ca |
13-Jun-2011 |
RoboErik <epastern@google.com> |
Remove refs to SyncColumns
Change-Id: I9a7d7424df9b8ba1ac76eaceb837e7106c2151b8
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 02f97c538fc46a08d857d2c807c76fd0eec12493 |
08-Jun-2011 |
RoboErik <epastern@google.com> |
Upgrade db to v305
-Add CAL_SYNC columns up to 10
-Rename Calendars.access_level to calendar_access_level
-Rename calendars _sync_version to cal_sync7
-Rename calendars _sync_time to cal_sync8
-Rename displayName to calendar_displayName
-Rename _sync_local_id to sync_data2
-Rename htmlUri to sync_data3
-Rename events _sync_version to sync_data4
-Rename events _sync_time to sync_data5
-Rename commentsUri to sync_data6
-Migrate Events _sync_mark to sync_data8
-Change sync_data2 from INTEGER to TEXT
-Change sync_data8 from INTEGER to TEXT
-Add SYNC_DATA columns up to 10
-Add EVENT_COLOR to Events table
Change-Id: I2b818bf54fbce57cb32918d239ec21035a499330
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarDebug.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCts.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
|
| bcba82631ab0ee16efe58f0e0b0b9c18d93a6fd2 |
24-May-2011 |
Andy McFadden <fadden@android.com> |
First cut at recurring event exception API
This adds two calls to the calendar provider:
insert(<baseURI>/exception/<original-event-id>)
This creates an exception to a recurring event. Depending on the
values provided, this may alter all instances, all future instances,
or just a single instance of the event.
delete(<baseURI>/exception/<original-event-id>/<exception-event-id>)
This deletes an exception to a recurring event.
Bug 4473786
Change-Id: I9bff5de24694dcd49d2036c6c99dd45b34b24c0f
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCts.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 9ec70fada3d8f7cf56d6b0d0947823ec5bce572c |
04-Jun-2011 |
Alon Albert <aalbert@google.com> |
Prepare Calendar Provider for GData 2.0 & Partial Update
This CL prepares support for GData 2.0 by adding the _SYNC_7 column to the Events table.
This column will contain the edit URL which used to be in SYNC_VERSION but in 2.0, will hold the eTag instead.
It also prepares for Partial Update by adding a column called lastSynced to Events & a column called canPartiallyUpdate to Calendars.
If a sync adapter sets canPartiallyUpdate to 1, the provider will dup events before modifying them locally and mark them as dups using the lastSynced column.
When a sync adapter then updates an event and sets DIRTY to 0, the provider will remove the duplicated event.
Since no sync adapters yet set canPartiallyUpdate or use SYNC_7, this change should effectivly be a NOP.
Change-Id: I651056b3c0306391e9e559ceb185e77187118846
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarInstancesHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/SQLiteContentProvider.java
|
| 2ce7955da7dffec7819ed38be85e72df8a6f33dc |
03-Jun-2011 |
RoboErik <epastern@google.com> |
Support cleanup of Calendar.java
-replaced refs to columns interfaces with the class where possible
-added support for selection/selection args in instance queries
-further cleanup
Change-Id: I97ee0c7ed1703696166fd4a007e232a42cece376
rc/com/android/providers/calendar/CalendarDebug.java
rc/com/android/providers/calendar/CalendarInstancesHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| d28490199861708e0e6890bcf0da80f09ab761fe |
03-Jun-2011 |
Erik Pasternak <roboerik@android.com> |
Merge "Revert "b/4460608 Deletes exceptions with original event""
|
| ab472739446ef9e4a6fdcf9903d6260741d96acf |
03-Jun-2011 |
Erik Pasternak <roboerik@android.com> |
Revert "b/4460608 Deletes exceptions with original event"
This doesn't work with the implementation in Google Calendar Sync. Instead we will need to delete exceptions for unsynced events only.
This reverts commit 9785ee857d77e644bcfb2a317d84d0eff5752e28
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| fa332ecedc0c340109811552407142f6e4f600b2 |
31-May-2011 |
RoboErik <epastern@google.com> |
Migrate syncN columns to cal_syncN
Change-Id: I2d7aa19c55f95cd9256a5c7289e6214d4bff3d5d
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCts.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
|
| 5231369dd9d214d799ad9c5b98951ba67e6036be |
27-May-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
| 068b59546242b7d9e2a79dc9aeb1b7bc60ce89bc |
27-May-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I9e20b49c877563b9955234af073bcc5bfe1a9cef
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ms/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
| da641c374b00946f37bfe00e53bb292f4e0103d8 |
25-May-2011 |
RoboErik <epastern@google.com> |
b/4466577 Migrate eventEndTimezone to sync_data1 for EAS
Change-Id: I02b3771e39c6e5e81dde05480683b5d5a991997f
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 9785ee857d77e644bcfb2a317d84d0eff5752e28 |
23-May-2011 |
RoboErik <epastern@google.com> |
b/4460608 Deletes exceptions with original event
Change-Id: I53fdc4783454e527860dcac187b5a88f66539665
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 34c32cd924eb8ee28381106b37044b78fd8cbc30 |
14-May-2011 |
RoboErik <epastern@google.com> |
Add original_id column + logic. db -> v301
Adds an original_id to the Events table for local reference to
an original event for exceptions. It also adds logic to keep this
value in sync with the original_sync_id so apps don't have to
update for it to continue working.
Change-Id: I0034ecedb6f7b582ba823daab8656b7778781d84
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 1906f98a3044aa7749d22eace8d6b74e9b00f7f6 |
20-May-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with gingerbread-release
Change-Id: I4ae4dcd4bff822e117178af2efd8527c90cd9d26
|
| 40c9e51c6ceeae02fe5f786f4793d8e4d94a3528 |
18-May-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I12db215bbdfe6bc89ae9d3e21cb8519e3ffaee02
es/values-fr/strings.xml
|
| c8383567db3ade2aea28447ad3bd09ac3033bcd7 |
06-May-2011 |
RoboErik <epastern@google.com> |
Upgrade Calendars table and db to v300
Changes several column names in the calendars table and jumps
the versioning for the db up to 300.
Change-Id: I515b3e0a54d73c8a6d25ca2d9f7c153fae68a210
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarDebug.java
rc/com/android/providers/calendar/CalendarInstancesHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCts.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
|
| e6abbcef7376deb6eab03bb598e5587406ba6b48 |
11-May-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I9a28675d8b9269502f48cf7ed2eef98346b219e3
es/values-ca/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-lv/strings.xml
es/values-nl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
| 0739be04415dfd61619b5611e82b7c9a6c83eae3 |
28-Apr-2011 |
RoboErik <roboerik@android.com> |
Requires sync adapter include account and type for writes
This is an initial change to introduce restrictions on write access.
It currently only restricts the sync specific Calendar fields and
requires that to do a sync write the account and account type must
also be included.
Change-Id: I29eac991557da784290ba92cde7d1172472ebad9
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCts.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 0be8830cffd0497b0368dd0df485bd92da2d9493 |
03-May-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: I3961fea25c612512ef458f68334b3ef56d7bfc5f
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
| 180076a810558478f55ade53ebef0a2ddfa6bbc0 |
25-Apr-2011 |
Andy McFadden <fadden@android.com> |
Rename function
createCalendarsTable201() was actually creating 202.
Change-Id: I399465b912bfcdb22363ac82b7772247afbb1274
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 0fa12d08f1406e453ae62bf937bb7e2764f00622 |
22-Apr-2011 |
Michael Chan <mchan@android.com> |
Merge "Added debug utility to copy calendar db to sd card."
|
| d5f4742d7ba16d791edd9fd33a1a2a42eeac709b |
19-Apr-2011 |
RoboErik <epastern@google.com> |
Adds test to compare schema of upgraded and new db
Change-Id: I3a27b9eadb01fff9459b179a28100bb014a24785
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
ests/src/com/android/providers/calendar/CalendarDatabaseHelperTest.java
|
| 9774e10b9b34b6b0715f8d5e413f068d7e29cd26 |
09-Mar-2011 |
Michael Chan <mchan@android.com> |
Added debug utility to copy calendar db to sd card.
Security team approved in
https://android-git.corp.google.com/g/#change,100928
Change-Id: I26560882584d4a7726f76dc13e94f3c3b559e6bd
ndroidManifest.xml
es/layout/dialog_activity.xml
es/values/strings.xml
rc/com/android/providers/calendar/CalendarDebugActivity.java
|
| 4067700dbedcf4c8a379c9ecba9b5603972b4607 |
19-Apr-2011 |
Andy McFadden <fadden@android.com> |
Update calendar database schema
This increases the version from 204 to 205, and includes these changes:
- rename+reorder "_sync_mark" to "sync6" (changing type from INTEGER to TEXT)
- rename "selected" to "visible"
- rename "organizerCanRespond" to "canOrganizerRespond"
- add "canModifyTimeZone"
- add "maxReminders"
- remove "_sync_local_id" (a/k/a _SYNC_DATA)
This CL will be accompanied by changes to:
frameworks/base
packages/apps/Calendar
packages/apps/Exchange
vendor/google
vendor/unbundled_google/packages/GoogleCalendarSyncAdapter
Change-Id: Idc82c26819432ac8756230a4fb0dd8165d255f27
rc/com/android/providers/calendar/CalendarAlarmManager.java
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCts.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
|
| 0c1b46a168426cb30db108ef1247c55c0bb06a1f |
19-Apr-2011 |
RoboErik <epastern@google.com> |
Merge "Inlines all the fields used during upgrade and tests"
|
| 2cff10f1a005bd7302245d4c680cf851193c3a97 |
15-Apr-2011 |
RoboErik <epastern@google.com> |
Inlines all the fields used during upgrade and tests
W/o inline, changing the fields will cause any old update code that
uses them to break without warning. Added a test forupgrading all
the way from v50 to the current version and fixed some bugs that
showed up as a result of the test.
Change-Id: I3673c784bfbe38d65d2a04b7e5aaeaf8cdcb21fa
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
ests/src/com/android/providers/calendar/CalendarDatabaseHelperTest.java
|
| 652277c5f856e37fa7c15929772db0f6bc2ef307 |
13-Apr-2011 |
RoboErik <epastern@google.com> |
Add test for modifying an event
Change-Id: Ib547ef5506b26ff673504dfa5129832f9f00d8d0
ests/src/com/android/providers/calendar/CalendarCts.java
|
| f5930ab5c4c0fe728cb8fdf923d482b4f272eb1f |
13-Apr-2011 |
RoboErik <epastern@google.com> |
Refactors CP2 to pull instances code into a separate file
Change-Id: I2e6046dcdec0f134724d8220525bd2395677f19e
rc/com/android/providers/calendar/CalendarInstancesHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 38135d41c14217f19736f060d40429d5b8a43f8a |
13-Apr-2011 |
RoboErik <epastern@google.com> |
Add test for adding/deleting an event
Also refactored to make reuse across tests easier.
Change-Id: I7970ce446a464df7612350d1876d8edb9a4f4c8d
ests/src/com/android/providers/calendar/CalendarCts.java
|
| d602743608c6bce77121b9e2809f1381418c93b6 |
12-Apr-2011 |
RoboErik <epastern@google.com> |
Modifies testing to allow quick generation of test data
Now uses a seed value to generate the test data and allow testing
small updates and verification of behavior in fields that weren't
changed.
Change-Id: Ie1906986ac1220ef81fc92118892bbc29ac475fc
ests/src/com/android/providers/calendar/CalendarCts.java
|
| 4cd49582b08291d51cd152e1d2bff7fb547bcae2 |
08-Apr-2011 |
RoboErik <epastern@google.com> |
Start of CTS test development for Calendar API
Adds testing of adding, deleting, and updating a calendar. Adds
support for local calendars to the provider and for using
selectionArgs to specify a calendar id.
Change-Id: I078ec5f64b33d0dac464a4962e906e0e65a2992f
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCts.java
|
| 959739d351af5d04e8c92f6b031f737348d4b139 |
01-Apr-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 8896c221c8e29b4119df653d31df06f8f2ec458e |
31-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| d030cc3932e1681282b3f700d6db051c338a7aea |
29-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 916a382c3c799fdebc25a5330221bf5dfce97617 |
28-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 4b695910f56b8445ddd1251948c53d9d295c5f6e |
26-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| a7ab1907a7e15a33011902bd74777892b3a32e5c |
25-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 7c5a79a85715d4e60db5ec93d532eaae1192e500 |
25-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 5070d7517584e508f243c6dbeb091d898c3dc98c |
24-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 420b7fb569773ae573fbe90c3a9c522d4c368863 |
23-Mar-2011 |
Erik <epastern@google.com> |
Refactor CP2 to move alarm code into CalendarAlarmManager
Change-Id: I07d8d028115ce21047afe9aeecb3bf9cc5f170be
rc/com/android/providers/calendar/CalendarAlarmManager.java
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/CalendarProviderBroadcastReceiver.java
rc/com/android/providers/calendar/CalendarProviderIntentService.java
rc/com/android/providers/calendar/CalendarReceiver.java
ests/src/com/android/providers/calendar/CalendarProvider2ForTesting.java
|
| 10e9c01549a0a5c0d3c75465d507171bc5368c6d |
23-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| c2352eab29be9320faa04ad16b44264588c7d1bf |
22-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 35b04087ae102d7c9231762e9b363293046e17ff |
22-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 175d0cd257853813cb258c7406af3bf481a36c10 |
21-Mar-2011 |
Erik <epastern@google.com> |
Fix CP2 tests on Crespo
There was a race condition on Crespo devices. This makes one of
the offending tests use a different calendar for its tests, though
more work remains to be done to better isolate the rest of the
tests.
Change-Id: Ib33ee65b641132e35296b1c8f6740b95fb462259
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| bea60c08b9203342a706ec1460c89611fb3dd037 |
21-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| b0b64b02184668bbbaef4bf7ca3de21ce802074e |
19-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| ff4cf26185efe0a896f03b24275c98b1ce9f261e |
18-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 4bdd2d377e3eafa24d09b6fc612b4744d749b9b7 |
17-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 234e8df620f27d8d0a360b7a4eed3d9ee54ed5e5 |
16-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| b5593c52bc358f96332417d0667070b55afab3c5 |
15-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 5bb1d556e151190606bad47f1a7a710ab099e6db |
12-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| e6e734e9be4698ca0104bca99e61b0be284f5cc5 |
11-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 0c92a278818d1fa10ea17c42e6c68e68e0d6bed6 |
09-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 21939d1caaaa47bb4816e86a3c83d13aaaaa25cc |
08-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 04874b10f1d8f3e3291da4957b403268a3aa94a4 |
05-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| a4e680d4aee35255dde10b46a08b390ebed8a161 |
05-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 6acb47a9a3feee8a61955590423b639a6bbea342 |
03-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 403fc93c3a4e5e58af1291ef9db0884d75c6b5cf |
26-Feb-2011 |
Fred Quintana <fredq@google.com> |
Merge "Make the "too many deletes" feature work for Calendar."
|
| 39c65e5716e21e863d8de587d139dae85f99422f |
25-Feb-2011 |
Fred Quintana <fredq@google.com> |
Make the "too many deletes" feature work for Calendar.
Bug: 3423269
Change-Id: I4a1680845f1b4d2d872302d796ecad76b091ec27
rc/com/android/providers/calendar/CalendarProvider2.java
|
| cd692d1b816887b6d8cb3d4f659b34a67d93ebff |
24-Feb-2011 |
Alon Albert <aalbert@google.com> |
am 3e0d2ab0: am efa03998: am a494fe4c: Add tests for quoted parameters
* commit '3e0d2ab082161fed16d6483984ae51b3a5dc1e4c':
Add tests for quoted parameters
|
| 3e0d2ab082161fed16d6483984ae51b3a5dc1e4c |
24-Feb-2011 |
Alon Albert <aalbert@google.com> |
am efa03998: am a494fe4c: Add tests for quoted parameters
* commit 'efa03998f48e2d835b3c10c26f26e9fdec0d9c32':
Add tests for quoted parameters
|
| efa03998f48e2d835b3c10c26f26e9fdec0d9c32 |
24-Feb-2011 |
Alon Albert <aalbert@google.com> |
am a494fe4c: Add tests for quoted parameters
* commit 'a494fe4c195bbdeddb687d5783717a631ee8b5e3':
Add tests for quoted parameters
|
| a494fe4c195bbdeddb687d5783717a631ee8b5e3 |
18-Feb-2011 |
Alon Albert <aalbert@google.com> |
Add tests for quoted parameters
Change-Id: I00308cfcde13b5ec642763f5abf0f35a38cb2e3e
ests/src/com/android/providers/calendar/ICalendarTest.java
|
| d30e12046c9eb7840b4aab77409e707a4ddb1aa9 |
17-Feb-2011 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: Ie9062c60749582177cadeb5a65e34ec88f2cd9fe
es/values-ja/strings.xml
|
| 45c8e1e3e4f6717e5e2df86dfb46affd12838f19 |
10-Feb-2011 |
Eric Fischer <enf@google.com> |
am a87655b6: (-s ours) am 6694d2f9: (-s ours) am 7ef0077f: Import revised translations. DO NOT MERGE
* commit 'a87655b6d20bd976a8ee8ff0d4dea9503dbe4377':
Import revised translations. DO NOT MERGE
|
| a87655b6d20bd976a8ee8ff0d4dea9503dbe4377 |
10-Feb-2011 |
Eric Fischer <enf@google.com> |
am 6694d2f9: (-s ours) am 7ef0077f: Import revised translations. DO NOT MERGE
* commit '6694d2f916368f1d023672675a78f4653108e2a1':
Import revised translations. DO NOT MERGE
|
| 6694d2f916368f1d023672675a78f4653108e2a1 |
09-Feb-2011 |
Eric Fischer <enf@google.com> |
am 7ef0077f: Import revised translations. DO NOT MERGE
* commit '7ef0077f9f6a3a4c50244e963b2215aebb0fe3ca':
Import revised translations. DO NOT MERGE
|
| aa7646eea23f5790791ccbfc19928d56acc2f89b |
07-Feb-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
Change-Id: I3eb1abbda1993155adbda3fd43f0480531f6c2c3
es/values-ja/strings.xml
|
| 9705e8711c43346f500da105b2951efd303ecd1f |
08-Feb-2011 |
Eric Fischer <enf@google.com> |
am 2d54cb5d: (-s ours) am 9163b04b: Import revised translations. DO NOT MERGE
* commit '2d54cb5de602a3de36ca537346a8496bdfbeb5e8':
Import revised translations. DO NOT MERGE
|
| 2d54cb5de602a3de36ca537346a8496bdfbeb5e8 |
08-Feb-2011 |
Eric Fischer <enf@google.com> |
am 9163b04b: Import revised translations. DO NOT MERGE
* commit '9163b04bc080b2289fcf94238e2dc742e4fd5f8f':
Import revised translations. DO NOT MERGE
|
| 9163b04bc080b2289fcf94238e2dc742e4fd5f8f |
08-Feb-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
Change-Id: I64c443a98aa77c74b643d3910518eeebf579e3b0
es/values-ja/strings.xml
|
| 7ef0077f9f6a3a4c50244e963b2215aebb0fe3ca |
07-Feb-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
Change-Id: I3eb1abbda1993155adbda3fd43f0480531f6c2c3
es/values-ja/strings.xml
|
| 74ca9ba319a55a7dcb222344d2582e4dabe5d3bf |
02-Feb-2011 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #3410789 (CalendarProvider: Support for selection args for delete calendars)
- add support for selection args
- add corresponding unit tests
Change-Id: I052d2f4792baf307b003ee602d0bd546ec8c5fc4
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 0b661565a6b440a2693313eebc0f0c81a1f96cf8 |
30-Jan-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile gingerbread-plus-aosp and honeycomb
Change-Id: Ia5cd432700452320d0a4cc81c8ea7f3669b6b422
|
| f3f3be477a1515121be72bdea8acc4cc92d2c843 |
30-Jan-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Mass merge from gingerbread - do not merge
Change-Id: I760dad6c380c43e11684470a68e15604c25dcf2e
|
| b555187c9deb8f769757702eb23e5efd1c63174f |
26-Jan-2011 |
Eric Fischer <enf@google.com> |
am 7aeb4e97: (-s ours) Import translations for additional languages.
* commit '7aeb4e97b62f78903da713c1328a5518bfb74b02':
Import translations for additional languages.
|
| e5822e32a6a4fc64af64b05c496bff1a130aee2f |
25-Jan-2011 |
Erik <epastern@google.com> |
am ff036559: Test changes to include for cl I9f9eb769
* commit 'ff036559eeca89b5e6ec138bfdc6a16c76f209e9':
Test changes to include for cl I9f9eb769
|
| ff036559eeca89b5e6ec138bfdc6a16c76f209e9 |
24-Jan-2011 |
Erik <epastern@google.com> |
Test changes to include for cl I9f9eb769
This modifies the tests to catch a cancellation update not deleting
the instances associated with that event.
Change-Id: I9e897d0406c4ad256b0afc1d765322fa652af7cf
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| e5368292f163e00b603a613a223a69abd3bdff5a |
21-Jan-2011 |
Erik <epastern@google.com> |
am 06c305d3: b/3374582 Deletes canceled events from the instances table
* commit '06c305d35741db303bd3aacd0eab5af8de0ab34e':
b/3374582 Deletes canceled events from the instances table
|
| 06c305d35741db303bd3aacd0eab5af8de0ab34e |
21-Jan-2011 |
Erik <epastern@google.com> |
b/3374582 Deletes canceled events from the instances table
This ensures that events that are changed to canceled (occurs with
exceptions that are then deleted) will be removed from the instances
table. After testing:
-creating a new deletion exception uses the new event code path and
doesn't hit this change, only existing events
that get deleted trigger it
-deleting a non-existing event is a noop that does not throw any errors
-the google sync adapter does hit this code again later, but has no
apparent side-effects from doing so
Change-Id: I9f9eb76988bed6edc108009bb7d982f551a6e72c
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 523cdf70676d74292757f4c7a41d349c3343735c |
08-Jan-2011 |
Eric Fischer <enf@google.com> |
am 1d3a5236: (-s ours) am 7aeb4e97: Import translations for additional languages.
* commit '1d3a523631c3c46e75e861f93553740fc1573862':
Import translations for additional languages.
|
| 1d3a523631c3c46e75e861f93553740fc1573862 |
07-Jan-2011 |
Eric Fischer <enf@google.com> |
am 7aeb4e97: Import translations for additional languages.
* commit '7aeb4e97b62f78903da713c1328a5518bfb74b02':
Import translations for additional languages.
|
| 7aeb4e97b62f78903da713c1328a5518bfb74b02 |
06-Jan-2011 |
Eric Fischer <enf@google.com> |
Import translations for additional languages.
Change-Id: I48e95660462276a252056c2fcfc6ccf87968f86d
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-en-rGB/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
|
| 9c1e8ba691be5aec0daac0baf1e6928d8f2d7156 |
04-Jan-2011 |
Fabrice Di Meglio <fdimeglio@google.com> |
am a89a2c47: (-s ours) am ba87fe41: Fix bug #3218104 (CalendarSyncAdapter says "android.content.OperationApplicationException: wrong number of rows: 0") - DO NOT MERGE
* commit 'a89a2c47fe43b47c6e671e6273b61638e8458bfb':
Fix bug #3218104 (CalendarSyncAdapter says "android.content.OperationApplicationException: wrong number of rows: 0") - DO NOT MERGE
|
| a89a2c47fe43b47c6e671e6273b61638e8458bfb |
04-Jan-2011 |
Fabrice Di Meglio <fdimeglio@google.com> |
am ba87fe41: Fix bug #3218104 (CalendarSyncAdapter says "android.content.OperationApplicationException: wrong number of rows: 0") - DO NOT MERGE
* commit 'ba87fe417cad7ba63354f145e32be18b18e77a1d':
Fix bug #3218104 (CalendarSyncAdapter says "android.content.OperationApplicationException: wrong number of rows: 0") - DO NOT MERGE
|
| ba87fe417cad7ba63354f145e32be18b18e77a1d |
22-Dec-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #3218104 (CalendarSyncAdapter says "android.content.OperationApplicationException: wrong number of rows: 0") - DO NOT MERGE
- revert code from https://android-git.corp.google.com/g/#change,54585 concerning deleteEventInternal()
- transform an UPDATE to a DELETE if we are processing a recurrence exception whose status is updated to STATUS_CANCEL
and if the recurrence exception does not have its original event (parent) anymore
- it is a merge from https://android-git.corp.google.com/g/#change,84438
Change-Id: Id42e258514cb09baf762369f67f27858aba48209
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 4f5b624afe3a23161c1937ebe5f6cd6990923d51 |
14-Dec-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Add more unit test for validating non repro of bug #3267616 on Honeycomb
- also fix units tests
- bug description: Phantom calendar event on phone (event does not exist)
Change-Id: I1c6384ed1da7a167868d8c7e61ccc877f33948bf
rc/com/android/providers/calendar/RecurrenceProcessor.java
ests/src/com/android/providers/calendar/RecurrenceProcessorTest.java
|
| fc30eb24b8ed12dec09957479f489f67cc43b42b |
10-Dec-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #3218104 (CalendarSyncAdapter says "android.content.OperationApplicationException: wrong number of rows: 0")
- revert code from https://android-git.corp.google.com/g/#change,54585 concerning deleteEventInternal()
- transform an UPDATE to a DELETE if we are processing a recurrence exception whose status is updated to STATUS_CANCEL
and if the recurrence exception does not have its original event (parent) anymore
This is due to special semantics attributed to STATUS_CANCEL by the Server
Change-Id: I2e71e68d6c740293920e3c52679f094314cab37a
rc/com/android/providers/calendar/CalendarProvider2.java
|
| fb668aa53760b291e9adcb2d0508fafc85697e1e |
07-Dec-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am dddd55f5: (-s ours) am 5defa1cb: am 3e970d64: Merge "Dont use the default locale when formatting SQL statements"
* commit 'dddd55f5fb987df51352501c883c201ad3bebc21':
Dont use the default locale when formatting SQL statements
|
| dddd55f5fb987df51352501c883c201ad3bebc21 |
07-Dec-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 5defa1cb: am 3e970d64: Merge "Dont use the default locale when formatting SQL statements"
* commit '5defa1cb5f0de2bea82e35b6af18e178c18bedd6':
Dont use the default locale when formatting SQL statements
|
| 5defa1cb5f0de2bea82e35b6af18e178c18bedd6 |
07-Dec-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 3e970d64: Merge "Dont use the default locale when formatting SQL statements"
* commit '3e970d64d542f95ad72afd1ebba8687f74803d99':
Dont use the default locale when formatting SQL statements
|
| 3e970d64d542f95ad72afd1ebba8687f74803d99 |
07-Dec-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "Dont use the default locale when formatting SQL statements"
|
| 7182cd43849f3f501d6596bf075798cddf507617 |
07-Dec-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Add more tests for validating closing of bug #1640517
Change-Id: I5c3f231d3294752e0d6dbd5658b07c64b69b5c8d
ests/src/com/android/providers/calendar/EventRecurrenceTest.java
ests/src/com/android/providers/calendar/RRuleTest.java
|
| ad269877baf9ce4c4711fb642398122ff3a5418c |
02-Dec-2010 |
Eric Fischer <enf@google.com> |
Rename Indonesian and Hebrew translations to match Locale.java conventions
Change-Id: I6d468f9e511c91958e8695a2898999af2d7277e3
es/values-he/strings.xml
es/values-id/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
|
| d3f13a1daf4bb837c39572294ed9c24ccd384806 |
01-Dec-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
am 4f59043c: (-s ours) Fix bug #3185258 Events (single / recurring) are not deleted immediately - DO NOT MERGE
* commit '4f59043ccc10bc2a13ae3bbc2c7f14998f3fe68c':
Fix bug #3185258 Events (single / recurring) are not deleted immediately - DO NOT MERGE
|
| e10c4ed591ad218549c3cc4601224e0a176a3e4c |
12-Nov-2010 |
Chen Mike <mike.chen@sonyericsson.com> |
Dont use the default locale when formatting SQL statements
It is not safe to use the default locale when using String.format
to produce SQL statements. Some locales will break the SQL
and as a consequence crash the app.
Change-Id: I302e0f65108d6ef75610361626779fdb8143d4e6
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| 06c61055fc7a1504eefcd6c9a471f7370526e532 |
01-Dec-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Improve logging for performInstanceExpansion
- make it consistent with Gingerbread
Change-Id: Ife0b18404bb36b27a703d763d9e80342fe0b92d4
rc/com/android/providers/calendar/CalendarProvider2.java
|
| c4204e6beba996326ca90d327da4f5a2f42dee4c |
18-Nov-2010 |
Eric Fischer <enf@google.com> |
Import initial translations for 20 new locales.
Change-Id: I13210328431cf692d781583ec088b2e9e75666e1
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-en-rGB/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-he/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-id/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
|
| 4f59043ccc10bc2a13ae3bbc2c7f14998f3fe68c |
11-Nov-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #3185258 Events (single / recurring) are not deleted immediately - DO NOT MERGE
- make instance expansion not expand recurring events that haev been deleted by the user
- merge code from master (change https://android-git.corp.google.com/g/#change,50285)
- merge code from master (change https://android-git.corp.google.com/g/#change,54585)
Change-Id: I957a2bcac0e7f3d39fe1c50390715bdf5d8e7705
rc/com/android/providers/calendar/CalendarProvider2.java
|
| c4d44fd028e7f5f44f46439c3410dab3456e6d3f |
05-Nov-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #1776278 (consider supplying our own (unique) eid for calendar entries created on the device)
- change schema for adding SYNC_ADAPTER_DATA into the Events view
- put the "gCal:uid" value into the Events.SYNC_ADAPTER_DATA column
Change-Id: I08788e9cd6d899c00d77a9b4b7f61d36a1e40aa3
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 656f9cb431c798c972260f31a4ebcd56047dff21 |
04-Nov-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Simplify CalendarAlarmManager code and unit tests
- implement only the needed delegations to AlarmService
- MockCalendarAlarmManager is mocking all the CalendarAlarmManager methods
Change-Id: I6f97a9a133a2336a791beb9b25874cbbb05ac857
rc/com/android/providers/calendar/CalendarAlarmManager.java
ests/src/com/android/providers/calendar/CalendarProvider2ForTesting.java
|
| e7a04f1fe637bc1322a6b4942e0251e3831cd544 |
03-Nov-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Code refactoring for fixing unit tests and making CalendarProvider2 more testable
- refactoring for mocking the use of the Wake locks
- refactoring for mocking the use of the AlarmManager (introduce the CalendarAlarmManager)
- fix the unit tests
- fix bug 3122402
Change-Id: I5914ccf886612de260bc3c60fa192aad6c9887d2
rc/com/android/providers/calendar/CalendarAlarmManager.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2ForTesting.java
|
| 8bb142159463f654ef07e20a341fcb527f0109f2 |
23-Oct-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #3098972 (event notifications may not fire on time)
- aggregate scheduling of next alarm checks for 5s
- use the AlarmService for controlling when to do the checks
- suppress the AlarmScheduler threads
- use a Service and trampoline for running the next alarm check
Change-Id: Id54f45375b0051e57f9c9d59499c7c4c9d247500
ndroidManifest.xml
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/CalendarProviderBroadcastReceiver.java
rc/com/android/providers/calendar/CalendarProviderIntentService.java
|
| 7750acdeb935bb6ad6a62e9d40cf7cd2c1cdf710 |
22-Oct-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Merge "Fix broken unit tests:"
|
| c3fb804639a62353b76ea45fded1022650c2a73a |
22-Oct-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix broken unit tests:
- improve test data generation and cleaning
- make the broken unit tests more close to reality (with better data sets)
Change-Id: Iff97951c026b26e1c7581e2834e9a135e0ee48b0
ests/src/com/android/providers/calendar/CalendarProvider2ForTesting.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| bb0fc0b885ca39a89397024b368890f096f12a49 |
19-Oct-2010 |
Erik <roboerik@android.com> |
am e43e3300: (-s ours) b/3102609 Update widgets when device tz changes. Do not merge
Merge commit 'e43e3300d9332b21153f6d16280f80bea8b7e097'
* commit 'e43e3300d9332b21153f6d16280f80bea8b7e097':
b/3102609 Update widgets when device tz changes. Do not merge
|
| e43e3300d9332b21153f6d16280f80bea8b7e097 |
16-Oct-2010 |
Erik <roboerik@android.com> |
b/3102609 Update widgets when device tz changes. Do not merge
Change-Id: I4e1a03dadcddc80bcc77c1d689e8eac267d47d7e
rc/com/android/providers/calendar/CalendarProvider2.java
|
| b5e628f741ca3f09f31af41cc12d3c8661caf330 |
13-Oct-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
More code cleaning
- extract SQL sentences
- use tables / columns constants
Change-Id: I209bfab1338ae4e86c3dd3002c81b57b2b461bcb
rc/com/android/providers/calendar/CalendarProvider2.java
|
| f82c2b1bc19b8493d324f95166444f2d206bc30e |
13-Oct-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Merge "More code cleaning"
|
| 15002a0ae2fa51f4eb6c19478fcb16cb86ac2bd3 |
13-Oct-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Merge "Fix issue where upward syncs were requested from the CalendarProvider2 even if the sync was initiated by the SyncAdapter"
|
| 258fc0a0054d6aba8556921c270379cea6bf3de1 |
13-Oct-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
More code cleaning
- use table / columns constants where they were missing
Change-Id: I3a72e88bf0c70919bd7590a9e067053cb24b5d85
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| fd8254e94619bbc7ffc37779208ee5ad78a9beb7 |
13-Oct-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix broken unit tests after Move SyncStateContentProviderHelper to frameworks/ex
- do not need to include android-common static lib
- see https://android-git.corp.google.com/g/72914
Change-Id: I8df4ad7b66d0fd0fb6c33cb6ff64cb8575a4730a
ests/Android.mk
|
| b7c010fdc02695b692cd74acf432e8ccb3bda70c |
13-Oct-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix issue where upward syncs were requested from the CalendarProvider2 even if the sync was initiated by the SyncAdapter
Change-Id: Ibf3f8aac6798e6882ca45a720ecab7ed5ca75b9b
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/QueryParameterUtils.java
rc/com/android/providers/calendar/SQLiteContentProvider.java
|
| f68948651eb7e282f75673f55a13b2881fc9f7d0 |
12-Oct-2010 |
Bjorn Bringert <bringert@android.com> |
Merge "cal: Move SyncStateContentProviderHelper to frameworks/ex"
|
| 2ca2671a32aedc6a105256a9f498d48f5cb910f1 |
11-Oct-2010 |
Michael Chan <mchan@android.com> |
am 4cd51d80: (-s ours) b/3081783 Fixed all days events to show the correct date
Merge commit '4cd51d80bbec3ef953d1a18dd4a7e4e903e608e3'
* commit '4cd51d80bbec3ef953d1a18dd4a7e4e903e608e3':
b/3081783 Fixed all days events to show the correct date
|
| deefe0733f0e52fc68f7234ba765163545880e41 |
08-Oct-2010 |
Bjorn Bringert <bringert@android.com> |
cal: Move SyncStateContentProviderHelper to frameworks/ex
Change-Id: I086fc7ea7ef62f24c138ba7d26da3a0f48919862
ndroid.mk
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 4cd51d80bbec3ef953d1a18dd4a7e4e903e608e3 |
10-Oct-2010 |
Michael Chan <mchan@android.com> |
b/3081783 Fixed all days events to show the correct date
Change-Id: I463fa99d22ad233f73fd4ced66aff891dc590a70
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| d8223536b8f050ff81dfb19a6ad6b186b3941211 |
01-Oct-2010 |
Erik <roboerik@android.com> |
Sends broadcast to widgets when htz changes
Change-Id: Ia7b3ad669fe6dd8512d02fcb68fdf13bf7b3b62e
rc/com/android/providers/calendar/CalendarProvider2.java
|
| b21124d119a22c3379a2ad34a59364cf59baa833 |
01-Oct-2010 |
Erik <roboerik@android.com> |
am 31038903: (-s ours) b/3019621 Collapses AlarmScheduler threads. Do not merge
Merge commit '310389035e8e7b607823325230c40220ac2dab60'
* commit '310389035e8e7b607823325230c40220ac2dab60':
b/3019621 Collapses AlarmScheduler threads. Do not merge
|
| c2d2953fa4ac4bf9066f40d97858e69e519269f1 |
01-Oct-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
resolved conflicts for merge of 3443e3eb to master
Change-Id: I3ae69d380d1fefd4cb69e7e0d234fc424914020d
|
| 310389035e8e7b607823325230c40220ac2dab60 |
30-Sep-2010 |
Erik <roboerik@android.com> |
b/3019621 Collapses AlarmScheduler threads. Do not merge
This adds some logic around running the AlarmScheduler to ensure
that only one version is run at a time. If new requests come in
while a version is already running they will be aggregated every
five seconds.
Change-Id: Idd61dc912796a835f46bfbe4a74837570b41bc06
ndroidManifest.xml
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/EmptyService.java
|
| 3443e3ebeaa39e8415b43e7cf3b218caee554e9b |
30-Sep-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #3025267 (Calendar App TZ are messed up when using Secondary TZ feature in Web Calendar)
- updateEventsStartEndFromEventRawTimesLocked() is now using the Event's timezone instead of the device one
- update unit tests
Fixed also cleaning of old CalendarCache data.
Change-Id: Ia7d543eda26a4a0dee1d7174f84d0f50097b81b0
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 1dbb6fdfced1effe5d809c8c60556590525c8edd |
28-Sep-2010 |
Daisuke Miyakawa <dmiyakawa@google.com> |
am 616e6f19: (-s ours) Hide events in a calendar when it becomes hidden. Do not merge
Merge commit '616e6f19fcef87a7dcc910a95c4c340683648ad0'
* commit '616e6f19fcef87a7dcc910a95c4c340683648ad0':
Hide events in a calendar when it becomes hidden. Do not merge
|
| 616e6f19fcef87a7dcc910a95c4c340683648ad0 |
27-Sep-2010 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Hide events in a calendar when it becomes hidden. Do not merge
Bug: 3035826
Change-Id: I4845a674414bf4fa03e1db11004a80c813893932
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 2c59eec67ab5a46ddb1ca9284f1116c1fd821a33 |
24-Sep-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix but #2942211 (Suppress CalendarDatabaseHelpder code that deals with versions...)
- remove upgrade code for obsolete versions 72, 73, 74
Change-Id: Ib49828a80be18bb3291be0bd644c72b3120166fa
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 930d4ce83fc1902de369c915a45c231d560bac36 |
24-Sep-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
resolved conflicts for merge of 8ba0d023 to master
Change-Id: I2c06ce83ae194d6dd3b9bf1ba9fe04fa9fdd2d37
|
| 8ba0d0238b153d331d612078b19492cb44728101 |
21-Sep-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #2985570 Event timezone is changed to device or Calendar timezone after sync
- When adding an Event, also add the originalTimezone ExtendedProperties if needed
Change-Id: Id7e03d75db2411bc26f4053af1908957ebe6b9ef
rc/com/android/providers/calendar/CalendarCache.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 9d9e7a94b8d1df6ed613eb45323b60dfb5617ad5 |
23-Sep-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
am 9ea30974: (-s ours) Fix bug #3029831 (Finalizing a Cursor that has not been deactivated or closed. database...) - DO NOT MERGE
Merge commit '9ea309741d32d9634a0eb6786f1cc3057d3f82a6'
* commit '9ea309741d32d9634a0eb6786f1cc3057d3f82a6':
Fix bug #3029831 (Finalizing a Cursor that has not been deactivated or closed. database...) - DO NOT MERGE
|
| 9ea309741d32d9634a0eb6786f1cc3057d3f82a6 |
23-Sep-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #3029831 (Finalizing a Cursor that has not been deactivated or closed. database...) - DO NOT MERGE
- add missing cursor.close() statement
Change-Id: I5a4287a6944bbc3091d30af45480e863405a8316
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 90b7162dc315dbd4553aca33d4689e4a1e3b6e07 |
23-Sep-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Merge "Fix bug #3029831 (Finalizing a Cursor that has not been deactivated or closed. database...)"
|
| 58313767dd0e7e3823c35ca61b40eddb9dd229bb |
23-Sep-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #3029831 (Finalizing a Cursor that has not been deactivated or closed. database...)
- add missing cursor.close() statement
Change-Id: Id37be1d7b83049c090c4a83d5b690844c2bf561c
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 7be45683e367bd6897daf6444b03be938f8f5eaa |
22-Sep-2010 |
Erik <roboerik@android.com> |
b/3008125 Make CP update the default prevTZ
The phone will default to GMT as the time zone on a fresh wipe
which is not a time zone that Calendar officially supports. This
change makes it so when the phone figures out where it is the
provider will update the default previous time zone to the phone's
new location instead of using GMT. This was manually merged from
gb.
Change-Id: I8d641b92ed488f243119fdb1fdd194b16b7e151f
rc/com/android/providers/calendar/CalendarProvider2.java
|
| a637bc824d92888eec9c6d2da0d5f1e594bebeba |
22-Sep-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix CalendarProvider2 unit tests (bug #2395696)
Change-Id: I539726fd82974af22e2d6e79782ed5ff2fcc4edb
rc/com/android/providers/calendar/CalendarCache.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 79abd65caa33a54171ba42790a21871dd692c00f |
22-Sep-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
am 52913fc7: (-s ours) Fix bug #3021653 (Clean CalendarProvider2 logging) - DO NOT MERGE
Merge commit '52913fc7cdf91c335e3559e0b38f9b3e2090737f'
* commit '52913fc7cdf91c335e3559e0b38f9b3e2090737f':
Fix bug #3021653 (Clean CalendarProvider2 logging) - DO NOT MERGE
|
| 52913fc7cdf91c335e3559e0b38f9b3e2090737f |
21-Sep-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #3021653 (Clean CalendarProvider2 logging) - DO NOT MERGE
- use Log.isLoggable() pattern
- add a log when dtStart2445 and dtEnd2445 are null at the same time in EventsRawTimes table
- make get2445ToMillis() less verbose
Change-Id: Ib1a560bc6732fa5c1569b56b0789a383cc4f34e5
rc/com/android/providers/calendar/CalendarProvider2.java
|
| f39a880f0554ce58ab7cf5e2e2191cb01a60fe75 |
21-Sep-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Manual merge - Fix bug #3021653 (Clean CalendarProvider2 logging)
- use Log.isLoggable() pattern
- add a log when dtStart2445 and dtEnd2445 are null at the same time in EventsRawTimes table
- make get2445ToMillis() less verbos
Change-Id: Ie5e13dff1dec10184e5cc336d0d40292791aa8cd
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 315d9326acd39566959f3c547225483f1fb6aefc |
11-Sep-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Manually merge "Add home timezone support" from Gingerbread:
- add querying CalendarCache key/values thru CalendarProvider
- add unit tests
Change-Id: I21bf5935789c663ba01409142df734007c5a3a4e
rc/com/android/providers/calendar/CalendarCache.java
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCacheTest.java
ests/src/com/android/providers/calendar/CalendarProvider2ForTesting.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| f60f974356c4753eec763cd19430be1d43a1b2b1 |
19-Sep-2010 |
Erik <roboerik@android.com> |
am 63c1db99: (-s ours) b/3008125 Make CP update the default prevTZ. Do not merge
Merge commit '63c1db9914a7b01181b71cc6c66d046ad7e794a9'
* commit '63c1db9914a7b01181b71cc6c66d046ad7e794a9':
b/3008125 Make CP update the default prevTZ. Do not merge
|
| 63c1db9914a7b01181b71cc6c66d046ad7e794a9 |
17-Sep-2010 |
Erik <roboerik@android.com> |
b/3008125 Make CP update the default prevTZ. Do not merge
The phone will default to GMT as the time zone on a fresh wipe
which is not a time zone that Calendar officially supports. This
change makes it so when the phone figures out where it is the
provider will update the default previous time zone to the phone's
new location instead of using GMT.
Change-Id: I359f5370f82c2aba8aa59fc0e60b40167ed3c8f3
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 338fa75813122624cfcb7ed9ff1e34e6700e8f0f |
16-Sep-2010 |
Erik <roboerik@android.com> |
am b8d67669: (-s ours) Fix widget to update correctly. Do not merge
Merge commit 'b8d67669dc0c02b4cb07afe920a714d0cf4ac238'
* commit 'b8d67669dc0c02b4cb07afe920a714d0cf4ac238':
Fix widget to update correctly. Do not merge
|
| 6083bfc4723b8311de33d87d50790a1ffcb0908a |
16-Sep-2010 |
Erik <roboerik@android.com> |
am 591948eb: (-s ours) Adjusts portrait widget layout. Do not merge
Merge commit '591948ebf4810893bfba8c09c96ef46a808473d5'
* commit '591948ebf4810893bfba8c09c96ef46a808473d5':
Adjusts portrait widget layout. Do not merge
|
| b8d67669dc0c02b4cb07afe920a714d0cf4ac238 |
15-Sep-2010 |
Erik <roboerik@android.com> |
Fix widget to update correctly. Do not merge
This changes widget to query the db directly since it is
already in a background thread. There were issues with using
an async query on top of a bg thread that this avoids.
Change-Id: If1a90e893627da4172530b073d0e89ea934409cb
rc/com/android/providers/calendar/CalendarAppWidgetProvider.java
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| a3de5a4ad15aba8632d315ecab277ca39a3a97c3 |
15-Sep-2010 |
Erik <roboerik@android.com> |
am 1431b9de: (-s ours) Adds home tz support to calendar widget. Do not merge
Merge commit '1431b9ded6f7a429a6f3c9e737fc79320627409c'
* commit '1431b9ded6f7a429a6f3c9e737fc79320627409c':
Adds home tz support to calendar widget. Do not merge
|
| 591948ebf4810893bfba8c09c96ef46a808473d5 |
15-Sep-2010 |
Erik <roboerik@android.com> |
Adjusts portrait widget layout. Do not merge
Moves the <x> more events message to the bottom of the widget in
landscape and adjusts the spacing so everything fits.
Change-Id: I689d427ccf516e5880045ed9abf22c2c57c60079
es/layout-land/agenda_appwidget.xml
|
| 1431b9ded6f7a429a6f3c9e737fc79320627409c |
15-Sep-2010 |
Erik <roboerik@android.com> |
Adds home tz support to calendar widget. Do not merge
Change-Id: I797d75b70b935a3b1b65bef994fcffffa764a693
es/layout/agenda_appwidget.xml
rc/com/android/providers/calendar/CalendarAppWidgetService.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 10d2a79700075436a52b47132b446c1159a20298 |
13-Sep-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
am 76f4f037: (-s ours) Add home timezone support - DO NOT MERGE
Merge commit '76f4f0375fa5892d3b2ab0c39d1fc367528b974c'
* commit '76f4f0375fa5892d3b2ab0c39d1fc367528b974c':
Add home timezone support - DO NOT MERGE
|
| 76f4f0375fa5892d3b2ab0c39d1fc367528b974c |
11-Sep-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Add home timezone support - DO NOT MERGE
- have handleEventDayQuery() use timezone
- update Javadoc
Change-Id: I1e5e4ce1dfa43088ea93566661f4b298fa53e47f
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 9fbea65e46020a8a9f6b798c9b6593542d9f012c |
11-Sep-2010 |
Erik <roboerik@android.com> |
am 830f982e: (-s ours) Fix bug where instances didn\'t regen. Do not merge
Merge commit '830f982e42eafaeb95b72fef9830167d39b025dc'
* commit '830f982e42eafaeb95b72fef9830167d39b025dc':
Fix bug where instances didn't regen. Do not merge
|
| 830f982e42eafaeb95b72fef9830167d39b025dc |
11-Sep-2010 |
Erik <roboerik@android.com> |
Fix bug where instances didn't regen. Do not merge
Instances table wasn't regenerating when the user switched to auto.
Change-Id: I43a40699f6fa99c3c90f3005ce464d50ef56b45a
rc/com/android/providers/calendar/CalendarProvider2.java
|
| a7124616c01a4fc244ae366dd370fe3015f98718 |
11-Sep-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
am 68040cf2: (-s ours) Add home timezone support - DO NOT MERGE
Merge commit '68040cf2602bb15bb4cf1072cf99132118d5a805'
* commit '68040cf2602bb15bb4cf1072cf99132118d5a805':
Add home timezone support - DO NOT MERGE
|
| 68040cf2602bb15bb4cf1072cf99132118d5a805 |
03-Sep-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Add home timezone support - DO NOT MERGE
- add querying CalendarCache key/values thru CalendarProvider
- add unit tests
Change-Id: I87da6b5174c800dca76d3965a7d7cb8953003e1a
rc/com/android/providers/calendar/CalendarCache.java
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarCacheTest.java
ests/src/com/android/providers/calendar/CalendarProvider2ForTesting.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| b222a85a892be92fe380c36abeaea79aa8f160dd |
27-Aug-2010 |
Mason Tang <masontang@google.com> |
Fixed alerts so that alerts for all-day events now fire relative to local time
- Fixes b/1522903
Change-Id: I4489ec65022d73db72405be067fa8841c421e265
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 9e0f0faf2feacc295685d96d30b2128bd22d48d2 |
26-Aug-2010 |
Guang Zhu <guangzhu@google.com> |
am 67770581: add emma filter to make file
Merge commit '6777058145e10eff868a2ad11841551772effc9b'
* commit '6777058145e10eff868a2ad11841551772effc9b':
add emma filter to make file
|
| 6777058145e10eff868a2ad11841551772effc9b |
29-Jul-2010 |
Guang Zhu <guangzhu@google.com> |
add emma filter to make file
so code coverage report won't contain classes in local static
Java libraries
Change-Id: Ie80871fd6a89afb1bb3ea86a6688a5857638803d
ndroid.mk
|
| c85033caa57bfb6438aa2785c7581a11076e9353 |
24-Aug-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
am e38b846e: (-s ours) Merge "Merge Froyo fix for CalendarCache init (Change I268be53d) - DO NOT MERGE" into gingerbread
Merge commit 'e38b846ecb52bcc7aa300b7a67f359f861a7cae2'
* commit 'e38b846ecb52bcc7aa300b7a67f359f861a7cae2':
Merge Froyo fix for CalendarCache init (Change I268be53d) - DO NOT MERGE
|
| e38b846ecb52bcc7aa300b7a67f359f861a7cae2 |
23-Aug-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Merge "Merge Froyo fix for CalendarCache init (Change I268be53d) - DO NOT MERGE" into gingerbread
|
| e6bb58361a3b806d15b9fea654b4033518bfb413 |
23-Aug-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Merge "Merge Froyo fix for CalendarCache init (Change I268be53d)"
|
| b492524403ca34b0cb03bfad6456909494479925 |
21-Aug-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Merge Froyo fix for CalendarCache init (Change I268be53d)
- update database schema version to 200 (need room for potential Gingerbread updates)
- fix initial row insert into CalendarCache table
- recreate the CalendarCache table with correct data when upgrading the schema
- make old 72/73/74 versions numbers obsolete on Honeycomb
Change-Id: Iaba940798ce1677d02efad342f79a9ce00be45ad
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| b16641dc5ccd42b9876a5541f1deea62242e0dbb |
21-Aug-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
am f6ab66a5: (-s ours) am 9be87f0a: (-s ours) Merge "Fix bug #2927288 (CalendarCache table is not setup correctly) - DO NOT MERGE" into froyo
Merge commit 'f6ab66a5d6654be38a69d0f413e7fca22dc862d0'
* commit 'f6ab66a5d6654be38a69d0f413e7fca22dc862d0':
Fix bug #2927288 (CalendarCache table is not setup correctly) - DO NOT MERGE
|
| a2f46bd2223d1bdad7ecd69803288493f73bc4bc |
20-Aug-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Merge Froyo fix for CalendarCache init (Change I268be53d) - DO NOT MERGE
- update database schema version to 100 (need room for potential Froyo updates)
- fix initial row insert into CalendarCache table
- recreate the CalendarCache table with correct data when upgrading the schema
Change-Id: I5d6844c3a10fdf63aedd9e7b7952cae144d6c35e
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| d74f8960b33b91b397c561662f69d8cd2e15ab20 |
06-Aug-2010 |
Mason Tang <masontang@google.com> |
Modified alerts behavior to not fire reminders for non-visible events
- Changed behavior of scheduleNextAlarmLocked to clean out the CalendarAlerts
table for events on non-visible calendars
- Added a call to scheduleNextAlarmLocked when calendar visibility is toggled
Change-Id: I67ef124c4ea654a24dd6c3aff6a59fa50ca74131
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 56292bcd683034ea05dd407ed15cebb70f954210 |
20-Aug-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
resolved conflicts for merge of d69a1a64 to master
Change-Id: Idbdf00fde2b62a6e910c5a7433473a589998e737
|
| f6ab66a5d6654be38a69d0f413e7fca22dc862d0 |
19-Aug-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
am 9be87f0a: (-s ours) Merge "Fix bug #2927288 (CalendarCache table is not setup correctly) - DO NOT MERGE" into froyo
Merge commit '9be87f0a751a29226f6d2a57054eb0627d370b9b' into gingerbread
* commit '9be87f0a751a29226f6d2a57054eb0627d370b9b':
Fix bug #2927288 (CalendarCache table is not setup correctly) - DO NOT MERGE
|
| 9be87f0a751a29226f6d2a57054eb0627d370b9b |
19-Aug-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Merge "Fix bug #2927288 (CalendarCache table is not setup correctly) - DO NOT MERGE" into froyo
|
| 743270bd7601ff4798a653dbb6ba5e956797a78a |
18-Aug-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #2927288 (CalendarCache table is not setup correctly) - DO NOT MERGE
- update database schema version to 70
- fix initial row insert into CalendarCache table
- recreate the CalendarCache table with correct data when upgrading the schema
Change-Id: I268be53d9d270ed469b7057b2636f81710ee23ba
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| d69a1a64027cd5937c7db622aaf7af493e6d3610 |
17-Aug-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #2891424 (Cant see events in Calendar - after updating timezone db)
- force the Instances re-expansion after cleaning them
Change-Id: Ie4c843ff95039b343caab7b34de5e1d963727a72
rc/com/android/providers/calendar/CalendarProvider2.java
|
| ba857d3cc7d9b55b05083c91795cdd8d5791d010 |
06-Aug-2010 |
Eric Fischer <enf@google.com> |
Import revised translations.
Change-Id: Ib151c5ad9696956c775b97852b704d9aa4367c88
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
| 0ba430ae0decfd575b0e0e27b0f7731ff7aec2b2 |
30-Jul-2010 |
Guang Zhu <guangzhu@google.com> |
Merge "add emma filter to make file"
|
| 82e83a96d7aae6b87ca6049b712e566537ee05a2 |
29-Jul-2010 |
Guang Zhu <guangzhu@google.com> |
add emma filter to make file
so code coverage report won't contain classes in local static
Java libraries
Change-Id: Iaf64cb9906a121ff56a65b8dbff30f5faee99bbb
ndroid.mk
|
| f50ca85e25d0e450b9f2ad78ee37870294462d4c |
28-Jul-2010 |
Mason Tang <masontang@google.com> |
Small fix to bug in attendee search in search arg loop logic
Change-Id: I0f8a3cdf92d91a85a0108dd2005ab0bfe8937392
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 18f75d6fe8dd0b4fb1deb5e56b4356ae6527bdbc |
21-Jul-2010 |
Mason Tang <masontang@google.com> |
Added support for searching attendees
Change-Id: I0ea6049cb97f213f529e06a10c468dbf553f2d23
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| dc866a1a66871a55810cbf98169f3212fb47acd3 |
21-Jul-2010 |
Mason Tang <masontang@google.com> |
Added support for quoted phrase search, string escaping in calendar provider
- We can now parse queries that include quoted phrases
- We also escape special characters like "%" and "_"
Change-Id: Iaf2519aa1b1af4753a2bf3b9bea342379186dac2
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 81d904d66bd746c077cc0baa6cf1f51fe030eac4 |
13-Jul-2010 |
Mason Tang <masontang@google.com> |
Added event search to the provider, fixed provider unit tests
- Implemented using LIKE pattern matching, no changes to the database
- This is completely transparent to the database itself
- The CalendarProvider2 unit tests will now pass...sometimes
Change-Id: I47f8285ad97edb6943951a563eaf9c5df83043d9
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 7e7329964ddd60c98e93a7eda18b68944a630382 |
16-Jul-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #2846543 Delete HIDDEN column from the "Calendars" table
- delete the "hidden" column and udpate the schema version for adding the "sync5" column
Change-Id: Ibeba3ab547626b4f6f8a0cb0f2dd49874e4d73d6
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
|
| 836bc8e9da32b8231f1b0d57be271730d7a5368d |
08-Jul-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #2793828 (Sync/visible setting on the phone should not affect what's visible on the web.)
- introduce "sync4" column into Calendars table to store "selected" from Web calendar
Change-Id: I29e8dc07969a4bc605cdfb4159c33cc5841b0c2e
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 1fc162fc3a3bb466a39146cf59a8b51ec5d9de52 |
08-Jul-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix calendar database update to version 72
- need to delete the trigger as it is still there even after altering the table name
Change-Id: I03633c204c8667de5cb39a08996d2c4caddede72
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 1b6beb61ef04c3da6ab0bdf8504ffecea2b9534c |
30-Jun-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #2779582 (Columns cleanup for the Calendars table)
- suppress deprecated "url" column
- replace eventsUrl / editUrl / selfUrl columns by sync1 / sync2 / sync3
- upgrade database
Change-Id: I03553dd926374f1125650db90af6ac4156261e8a
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
|
| dabc4a9d60080bf97e50baad83acf2ec6c3adc07 |
01-Jul-2010 |
Mason Tang <masontang@google.com> |
Fix bug 2812165 - Flooding of notification intents during CalendarSync
- Instead of a fixed timeout delay of 1 second for all provider updates, we
now will choose either a 1 second delay for regular updates, or a 30 second
delay for sync-related updates. This should be a long enough window so that
the notification intent only fires once or twice even over a very long sync.
Change-Id: Ife292d04749717c4d3770fd6bcc7c42c3b5a9e05
rc/com/android/providers/calendar/CalendarProvider2.java
|
| a84cc39ca05e0e799f03e04a1d3e30b5ff733cd7 |
18-Jun-2010 |
Mason Tang <masontang@google.com> |
Refactored so that the widget is now with the app, not the provider
- CalendarProvider2 now broadcasts a PROVIDER_CHANGED intent to notify the
widget and any listeners of changes
- CalendarProvider2 will also batch any update notifications over a
configurable timeout, right now at 3 seconds, in order to prevent a storm
of intents.
Change-Id: I884c2fff505be39f6a17b389e002b7bd07976141
ndroidManifest.xml
es/anim/slide_in.xml
es/anim/slide_out.xml
es/drawable-hdpi/appwidget_bg.9.png
es/drawable-hdpi/appwidget_bg_focus.9.png
es/drawable-hdpi/appwidget_bg_press.9.png
es/drawable-hdpi/appwidget_calendar_bgtop_blue.9.png
es/drawable-hdpi/white_list_rule_cal.9.png
es/drawable-mdpi/appwidget_bg.9.png
es/drawable-mdpi/appwidget_bg_focus.9.png
es/drawable-mdpi/appwidget_bg_press.9.png
es/drawable-mdpi/appwidget_calendar_bgtop_blue.9.png
es/drawable-mdpi/white_list_rule_cal.9.png
es/drawable/appwidget_background.xml
es/layout-land/agenda_appwidget.xml
es/layout/agenda_appwidget.xml
es/layout/page_appwidget.xml
es/values-land/dimens.xml
es/values/colors.xml
es/values/config.xml
es/values/strings.xml
es/values/styles.xml
es/xml/appwidget_info.xml
rc/com/android/providers/calendar/AppWidgetShared.java
rc/com/android/providers/calendar/CalendarAppWidgetProvider.java
rc/com/android/providers/calendar/CalendarAppWidgetService.java
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/EmptyService.java
rc/com/android/providers/calendar/TimeChangeReceiver.java
ests/src/com/android/providers/calendar/CalendarAppWidgetServiceTest.java
|
| ae4e50b2c35fe4549d1df6568544aa72057dcbe1 |
04-May-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #2619140 (ANR: calendar provider does too much in onCreate())
- make the CalendarProvider2 onCreate() similar to the ContactsProvider2
- do lazy initialization and use the previous Timezone checker thread to run the verifyAccounts()
- get the writable database reference as soon as possible
Change-Id: I9e840ae47d7aacfe48c5e4ebc22b509189bb51bd
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 3ee5e75440f52e76bfef1aae73e2a4047ae45e7c |
16-Jun-2010 |
Mason Tang <masontang@google.com> |
Fix bug #2589483 and implemented animated pagination in the widget
- Fixed a number of refresh issues in the widget
- Implemented animated pagination for overflowing events
- Updated corresponding unit tests for new behavior
Change-Id: I8883611be476d61d655c4427b8b9ba86092b0cbb
es/anim/slide_in.xml
es/anim/slide_out.xml
es/layout/agenda_appwidget.xml
es/layout/page_appwidget.xml
es/values/colors.xml
es/values/config.xml
es/values/strings.xml
es/values/styles.xml
rc/com/android/providers/calendar/CalendarAppWidgetService.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarAppWidgetServiceTest.java
|
| bedfbe0065e48c652814bd3b864dabf7589f344b |
17-Jun-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix broken AFTER_EVENT_INSERT_SQL trigger for CalendarDatabaseHelper
- was broken in https://android-git.corp.google.com/g/#change,54504
as part of fix for http://b/2772317
Change-Id: I11d3ed62a2cd3f16edab2eb25ec3edd7abe41e28
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| c59a6b5d8ff6b941fc44e9181e668fe0ec7df088 |
16-Jun-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #2772731 (Start deprecation of "url" Calendars column in favor of "eventsUrl" column)
- suppress references to Calendars.URL
Change-Id: I40ffe3ca5c6113bc09802521f1c4b35eb8c67d80
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
|
| 7cb72fa3ea680dce378d8dac71f878e52e03f83a |
16-Jun-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug# 2772317 (CalendarDatabaseHelper internal cleanup)
- use constants defined into Calendar interfaces
Change-Id: Ia1e87e0605c75619677826fc8a1dcadbe0973ca6
rc/com/android/providers/calendar/CalendarCache.java
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 370f91c0cfe5a5fecaba6120e703f4d2271d2277 |
16-Jun-2010 |
Erik <roboerik@android.com> |
b/2635697 Makes recurring events disappear immediately when deleted
We had added a special check to make sure deletion exceptions weren't reexpanded
but deleted recurrences were still being reexpanded until after they synced up
to the server and the underlying event was removed. This change prevents deleted
recurring events from being expanded in the instances table. Also needed to delete
all exceptions to the event ( b/1383817 ).
Change-Id: Ia9bb69e35c34086f691653fe24aad6d96a211da9
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 4755f64efe4aee60d0c2236d35b7e42ed74e4cb9 |
15-Jun-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Merge "Fix bug #1661857 (switch from using meta feed to the new allcalendars feed)"
|
| 7fcb12833c80a7f33a156d6ab25121bc05fc70de |
11-Jun-2010 |
Michael Chan <mchan@android.com> |
b/2550724 Clean up of https://android-git.corp.google.com/g/#change,46783
No functional change. Just clean up per code review:
Rename TextAppearance.widget_xxx to TextAppearance.XxxWidget
Added android:visibility="gone" for items that won't be visible
Replaced hard coded strings with constants in where clause e.g. "startDay" -> Instances.START_DAY
Removed EventInfo.hashCode() and EventInfo.equal(). Will be comparing .toString in the tests instead
Renamed getAppWidgetModel to buildAppWidgetModel
Change-Id: Id70b891df2323ae0af9500c3cfabc60940366934
es/layout-land/agenda_appwidget.xml
es/layout/agenda_appwidget.xml
es/values/styles.xml
rc/com/android/providers/calendar/CalendarAppWidgetService.java
ests/src/com/android/providers/calendar/CalendarAppWidgetServiceTest.java
|
| 43b3eba05ef67bdd4b0a2b285b6ed2b377c136c5 |
22-May-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #1661857 (switch from using meta feed to the new allcalendars feed)
- add support for new database schema for Calendars table (new columns: selfUrl, editUrl, alternateUrl, eventsUrl)
- add database upgrade code
- update Events.DELETE constant
- add Calendars Entity support
Change-Id: I040d153ce9ba15f77b582c083a79ea6e8e777535
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarDatabaseHelperTest.java
|
| 1e0a2eebcf3c9d4609c5719856c013072d10facb |
09-Jun-2010 |
Michael Chan <mchan@android.com> |
b/2550724 Add second event to calendar widget in portrait mode.
- Show "<time>, Tomorrow" if the event happens tomorrow.
- Show "<time>, <day of the week>" if within the next 7 days
- Drop the time for all day events
- Stop showing current event 15 minutes into the event or halfway which ever is first
and switch to the next event. (previously it was midway through an event or no grace
period for events longer than a day)
- b/2278475 Fixed the problem where the widget is not refreshing at midnight
- Query for 10 events instead of a weeks worth
Change-Id: Ia516ab25ed12ba9905e4e9ed9d49aa7209817f2c
es/layout-land/agenda_appwidget.xml
es/layout/agenda_appwidget.xml
es/values/colors.xml
es/values/strings.xml
es/values/styles.xml
rc/com/android/providers/calendar/CalendarAppWidgetService.java
ests/src/com/android/providers/calendar/CalendarAppWidgetServiceTest.java
|
| 207a50356465283ec613deeb10057c1bcde34218 |
28-May-2010 |
Jeff Hamilton <jham@android.com> |
am 25b0f0ee: Add a PRE_BOOT_COMPLETED receiver.
|
| 25b0f0ee070a5fff18cfcaffa86cb1607941c8a5 |
26-May-2010 |
Jeff Hamilton <jham@android.com> |
Add a PRE_BOOT_COMPLETED receiver.
It runs the first time after an OTA and either creates
the database or runs the upgrade path on it. This may
take a significatn amount of time so it's done before
the boot animation completes.
Bug: 2713849
Change-Id: Ie7ac396bd82577cd421daa102ad05c0abf55b6f0
ndroid.mk
ndroidManifest.xml
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarUpgradeReceiver.java
rc/com/android/providers/calendar/EventLogTags.logtags
|
| 02494e34ecc44c1557a9929cdaef24d603e63450 |
30-Apr-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Improve deleteEventInternal() by issuing only the correct deletes
- suppress explicit deletion of Attendees when deleting an Event (because of the delete trigger on the Events table)
- delete Instances / EventsRawTimes / Reminders / CalendarAlerts / ExtendedProperties for the Calendar App only
Change-Id: Icab7fc4fe3ff48381c6a24ff20cae1d88caf4c9b
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 54ae579e0d35448ab78aa35b44c471f27f7e5335 |
28-Apr-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
am 10b51a19: Fix for bug #2634470 (Force close in FRF26)
|
| 10b51a19b296eac6c43608a7a57fb910b0e5e8bc |
28-Apr-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix for bug #2634470 (Force close in FRF26)
- make deleteEventInternal() not launching a thread for checking alarms when used in a batch
Change-Id: I72f8fe9ba1561623732f02bcbfb3d92dd4fde097
rc/com/android/providers/calendar/CalendarProvider2.java
|
| f0a323569abc78c869990cfb706a709418733700 |
27-Apr-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
am 1dc29193: Fix bug #2622128 (Can\'t delete Exchange event exception)
|
| 1dc2919361bc56af0c5ea763845fae49d289839a |
27-Apr-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #2622128 (Can't delete Exchange event exception)
- use DELETE status during instances expansion
It was previously only checking if the eventStatus was not STATUS_CANCELED for inserting
the instance. Now it should be not DELETED as well.
Change-Id: Ifc870ad5026c9680593e4adf63596852c056b3eb
rc/com/android/providers/calendar/CalendarProvider2.java
|
| d8866559e203841fef69293d4e7d5c6c88e47a3b |
13-Apr-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
am 34a32009: Merge "Fix bug #2590414 (android.database.sqlite.DatabaseObjectNotClosedException: Application did not close the cursor or database object that was opened here)" into froyo
|
| 34a320093a689fa326c1b2b2b6a26771f0ba7400 |
13-Apr-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Merge "Fix bug #2590414 (android.database.sqlite.DatabaseObjectNotClosedException: Application did not close the cursor or database object that was opened here)" into froyo
|
| 89b9b3303f629b277adc44c5a0e7b9845f045a25 |
13-Apr-2010 |
Erik <roboerik@android.com> |
am e3730b9d: b/2440161 Made UTC override timezone for allday events
|
| e3730b9dce00439666e7ef324a28263a0ee92032 |
12-Apr-2010 |
Erik <roboerik@android.com> |
b/2440161 Made UTC override timezone for allday events
Exchange events had an incorrect timezone set for allDay events and we were setting
sec, min, hour to zero on that timezone. This change will make it override any tz
set and force allDay events to be in UTC.
Change-Id: I14fbdcc14bae2ef45b2e5e0c70e68e4c26136d7b
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
ests/src/com/android/providers/calendar/CalendarDatabaseHelperTest.java
|
| 1f755da44aeecdc84d0e957d55178f942dfdb15d |
12-Apr-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #2590414 (android.database.sqlite.DatabaseObjectNotClosedException: Application did not close the cursor or database object that was opened here)
- close Cursor as needed
- code formatting
Change-Id: Ia4d00392927eabbd2e69cc6181b9809656fc5299
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 67c464e0099db5b6da561c46031f71910ba075b8 |
10-Apr-2010 |
Erik <roboerik@android.com> |
am 63540b18: Merge "b/2560858 Upgrade will clean up allDay events" into froyo
|
| cf6826b976514c8b7311a81650956115d1eab408 |
10-Apr-2010 |
Brett Chabot <brettchabot@android.com> |
am 73e55ee0: Remove flaky CalendarProvider2Test from continuous.
|
| 63540b183addfa1707c5f7e1fae4ee0a5080cf30 |
09-Apr-2010 |
Erik <roboerik@android.com> |
Merge "b/2560858 Upgrade will clean up allDay events" into froyo
|
| 7b40dde3168f4af2c757cb43955aa3bfe1668666 |
08-Apr-2010 |
Erik <roboerik@android.com> |
b/2560858 Upgrade will clean up allDay events
Added an upgrade step that will clean up allDay events in the database. This
will set times to have hms be 0 for allday events and try to format duration
into P<#>D. This doesn't fix other problems, such as fields having a value
when they shouldn't.
Change-Id: Ifb1e28bd2e536324e73558ce79da44f7c5b550d7
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
ests/src/com/android/providers/calendar/CalendarDatabaseHelperTest.java
|
| e6ef9bfeeea2c618a025ef49154548cd1c93f9c9 |
09-Apr-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
am 679d544f: A better and simplier fix for bug #2556677 (pre-froyo->froyo calendar schema upgrade mangles CalendarMetaData schema, causing strange instance expansion issues)
|
| 73e55ee06fd7c595495d0ed8971a5dae36fb0399 |
09-Apr-2010 |
Brett Chabot <brettchabot@android.com> |
Remove flaky CalendarProvider2Test from continuous.
Bug 2395696
Change-Id: I1fc3b6e83756c97a888a2173b97508d5a2142c5f
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 679d544f38aa33d00c12884b987d8f8af2a6a6d3 |
09-Apr-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
A better and simplier fix for bug #2556677 (pre-froyo->froyo calendar schema upgrade mangles CalendarMetaData schema, causing strange instance expansion issues)
We need to clean the Instance table and recreate the CalendarMetaData table
when database version is between 59 and 66 included.
Change-Id: If105ce3629685d40bc5966bb3cdd7ca613a29f7e
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 422108d903a31f5ae31971a1305e523f91cc90a1 |
09-Apr-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
am 1599ceb2: Fix bug #2556677 (pre-froyo->froyo calendar schema upgrade mangles CalendarMetaData schema, ...causing strange instance expansion issues)
|
| 1599ceb270bc70f81dcaf8ecf4568453d7dddd9e |
08-Apr-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #2556677 (pre-froyo->froyo calendar schema upgrade mangles CalendarMetaData schema,
...causing strange instance expansion issues)
- force recreation of CalendarMetaData table for versions 59 (start of the problem) to 66 included
- clean Instance table (we need to have it recomputed)
- update schema version to 67
- moved code of upgradeToVersion56() and upgradeResync() to their correct location
Change-Id: Ie95b11cc75ec2200ce32deaee49e0a7c6114acf7
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| e197216a892052d41acefbccbb79299ac9c65386 |
07-Apr-2010 |
Michael Chan <mchan@android.com> |
am 6c7b032a: b/2278475 Refresh calendar widget at midnight
|
| 6c7b032aa9d84c703f6c02982837ecb8a1ac509a |
06-Apr-2010 |
Michael Chan <mchan@android.com> |
b/2278475 Refresh calendar widget at midnight
Change-Id: Ie7340c5b79733c9124bbeff9de72fa0d776644dc
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| 36cb2d807c8dbfbd11cc65c66ad9004d27f34cec |
31-Mar-2010 |
Ken Shirriff <kens@google.com> |
am d5aa3cc1: Upgrade sync state database for calendar if necessary.
|
| d5aa3cc17ecda3d72882d9a2e6c48577892df903 |
29-Mar-2010 |
Ken Shirriff <kens@google.com> |
Upgrade sync state database for calendar if necessary.
bug 2549250
Change-Id: I9957cc5385363aeac93f2bea20453bab3e8446a8
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| d6365380723489d2d38afe34d267f747325108c3 |
25-Mar-2010 |
Erik <roboerik@android.com> |
b/2542803 Removed the throw for other time formats.
Were throwing an exception if an allDay event had duration in a format
other than 'P#S' or 'P#D'. Removed the throw so other formats can be
used (though we will not check them for correctness).
Change-Id: I3541b43c693c2ee42af3d3be5463ec02cf69aedc
rc/com/android/providers/calendar/CalendarProvider2.java
|
| d5475a8c72d98644718dbecdb5dce8bfedc18b4b |
18-Mar-2010 |
Ken Shirriff <kens@google.com> |
Fix recurrence expansion with COUNT.
The problem was the first instance was not getting counted if it fell to the left
of the expansion range, resulting in one extra instance getting created on the end.
Also provide unittests for recurrence expansion and remove some dead code.
bug 2515885
Change-Id: Idcc46ef45c860c26fd6cff5b9ae6d5d160d3ed00
rc/com/android/providers/calendar/RecurrenceProcessor.java
ests/src/com/android/providers/calendar/RecurrenceProcessorTest.java
|
| 6636020e221f0040d2d78ea03e7b3d9223256ff3 |
23-Mar-2010 |
Ken Shirriff <kens@google.com> |
Fix flaky testAttendees test.
The onAccountsUpdated() method would asynchronously delete events,
causing random test failures. This change overrides that method.
This change also adds an assert so failures will be cleanly reported,
rather than causing stack traces.
bug 2395696
Change-Id: Idf36d96f83174bd8da216883a6371c24dcfe2ca1
ests/src/com/android/providers/calendar/CalendarProvider2ForTesting.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| fb0d833fa43a6db7f6fea96d8b9d2074b6310633 |
18-Mar-2010 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations"
|
| f7ebcad2409a3c6b31cf4e62fc007b6d844cb685 |
18-Mar-2010 |
Kenny Root <kroot@google.com> |
Import revised translations
Change-Id: I96344b95b6f4c80defbae19339034986ff83edb5
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
| 1030436aca59c5123ac90e325e8dbd7e04143909 |
18-Mar-2010 |
Ken Shirriff <kens@google.com> |
Make instance expansion specific to a calendar.
In the old code, canceling of recurrence instances due to exceptions was
based on the sync_id and time. If two calendars happened to have events
with the same sync_id and time, the wrong cancellations could happen.
In this change, sync_id:calendar_id is used to track instances and cancellations
to ensure uniqueness.
bug 2425227
Change-Id: I0b79340f3f45a124f3e3850754c5e5c9cb2bd5a0
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 25e5cdec4e39982fedcce0733d2b8ad1aa665b19 |
18-Mar-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #2519159 (com.android.providers.calendar.CalendarProvider2Test:testChangeTimezoneDB is failing)
- update visibility for method getTimezoneDatabaseVersion()
- update CalendarProvider2 make file (add guava) and clean tests make files
Change-Id: I61a0f1a8fb164e6f28137eb816555b3a96dc8a80
ndroid.mk
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| e604c19770482e181aa60a611b861ce5d8ed67d7 |
16-Mar-2010 |
Ken Shirriff <kens@google.com> |
Make sure values are set correctly when inserting event.
For a recurrence, dtend must be null. This change enforces that,
as well as some other conditions on the value.
Includes unittest.
bug 2513213
Change-Id: I04a1b7bd2f91e579177dd80741b4487409e903fc
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 2c32ee7d6feec2b6823dbaa3778e8f4b10102214 |
12-Mar-2010 |
Erik <roboerik@android.com> |
Looks like db version wasn't updated with the last change
Upped the DATABASE_VERSION to 66.
Change-Id: I6431eeee24560925ea9774a79bc89faeae19d826
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| a6357118c223d00ed722ecd40ecdda92d705d211 |
12-Mar-2010 |
Erik <roboerik@android.com> |
b/2497120 Added method for rebuilding db in upgrade failure
We're getting crashes from experimental testers that look like the user
downgraded then upgraded their phone without doing a data wipe. Added a
catch for this that will wipe and rebuild the db if the upgrade fails like
this.
Change-Id: I8d2f28dd7a4a312f56573e3fffd2d8e3a2539350
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 48de6f3f474a66bca2d9398f4697d13ab9857ad3 |
12-Mar-2010 |
Ken Shirriff <kens@google.com> |
Merge "Fix cursor leak."
|
| ae2599e63fe5e153ba735564ef3c0898d4f3c833 |
12-Mar-2010 |
Ken Shirriff <kens@google.com> |
Fix cursor leak.
Cursor was not getting closed if cursor returned zero results.
bug 2510590
Change-Id: I39e65056e2639f1afe7872a2bd14c5cbf7ca8e67
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 1420c34753d5785a5d0fe2549ecef88a1d7a12aa |
12-Mar-2010 |
Marc Blank <mblank@google.com> |
Merge "Add an organizerCanRespond column to Calendar table (with default 1)"
|
| bf897b03effb752368a98cfb89e6b90cfdde50fc |
12-Mar-2010 |
Marc Blank <mblank@google.com> |
Add an organizerCanRespond column to Calendar table (with default 1)
* Partially addresses the referenced bug
* Exchange calendars will have this column set to 0
* When set to zero, the UI should not display the organizer's attendee status
Bug: 2507842
Change-Id: I1181a6eb3575a70b4587a94de35fc4abf6fb00c8
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 5ffa764437e2f572ff8f8c21737c783fa2ca6010 |
12-Mar-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #2427686 (CalendarProvider2Test tests intermittently failing...
...with attempt to acquire a reference on a close SQLiteClosable)
- re-use instead of getting twice a reference to a writable database
Change-Id: I5773d380703783368deb40d0e0d06c6371ada015
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| cf9dc6b9bd031b1f6f811a32326ee85429c94deb |
10-Mar-2010 |
Marc Blank <mblank@google.com> |
Update database version and add upgracde code for previous change
Change-Id: Iec862424c552a30622a49f2b3eed81a714bcb503
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 1b7ecf93653da26f9aaf50bec329f29827129be3 |
10-Mar-2010 |
Marc Blank <mblank@google.com> |
Merge "Add _sync_mark to view_events view"
|
| a450a5220c7aa7a2693cd23d8d21a0dfe5614067 |
10-Mar-2010 |
Marc Blank <mblank@google.com> |
Add _sync_mark to view_events view
Change-Id: I86d30f538a4c8e60136a244133cb9c7aec2353b4
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 646444fdde3bde0a2ac948e021bc52b07c1d4a18 |
05-Mar-2010 |
Erik <roboerik@android.com> |
b/2440161 Added time checks for allDay events.
allDay events where sec, min, hour are not 0 are being added into the db
which causes an exception to be thrown. Added in checks to cp2 that will
correct events with this mistake and warn instead.
Change-Id: I09485114be605b2b2dbb2c4897dc908e5c609cf5
rc/com/android/providers/calendar/CalendarProvider2.java
|
| a0c4ab0002276a5ed2dd9c9e13ebe5d5b7d57f70 |
10-Mar-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Merge "Fix broken tests for CalendarProvider2"
|
| eb7ee6232dc1f62b7bf71abc8e706cbf81b00235 |
10-Mar-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix broken tests for CalendarProvider2
- bug #2498493 (CalendarProvider2Test has a bunch of failures)
- bug #2500587 (com.android.providers.calendar.CalendarProvider2Test:testInstanceRange is failing)
- bug #2500598 (com.android.providers.calendar.CalendarProvider2Test:testCalendarAlerts is failing)
Change-Id: Iee19756b8f154353b86ffde139976d2ab9728686
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 2eda117fcee7acc041177175a6bd69040b15d0c4 |
09-Mar-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Add an empty CleanSpec.mk
Change-Id: Ic8949a28696ae895670a1c9fded2ceb8dea7d882
leanSpec.mk
|
| 48f38786c5eef920ff47bf08718be3ff94b68993 |
06-Mar-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #2490708 (NPE in CalendarSyncAdapter when adding and deleting an Event)
- clean events from the Events/Attendees table is they are local
Change-Id: I4dd21db96034bde2cda9f8f1dd553033c5a25ff4
rc/com/android/providers/calendar/CalendarProvider2.java
|
| e1a154bbccfd224a90647ab16f5c52fc96b4339d |
05-Mar-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Merge "Fix bug #2485358 (add more logging to CalendarProvider2)"
|
| f6ba05c386c9bbac4e0cafefbd4199b897fbb9c4 |
04-Mar-2010 |
Eric Fischer <enf@google.com> |
Import new translations
es/values-zh-rTW/strings.xml
|
| 26d0bf3c34f170f9398ac32bf04b87d4957a4441 |
04-Mar-2010 |
Ken Shirriff <kens@google.com> |
Move calendar wipeData to the test.
This method is only used by the test, so it doesn't make sense to have
it in the CalendarDatabaseHelper. This also caused test failures when
Proguard filtered out this method.
bug 2487351
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| ab42ec67e77c398ac94ff1cf561fadd9f6b48dcb |
03-Mar-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #2485358 (add more logging to CalendarProvider2)
Change-Id: I1bac8559d75e712b0a9c66c352ea971fc153367b
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 8888a5a92dc717a485a1b934347f804c264b57f5 |
01-Mar-2010 |
Ken Shirriff <kens@google.com> |
Replace android.pim.DateException with com.android.providers.calendar.DateException.
Since DateException is only used by the calendar provider, it should be in the provider
code. Then android.pim.DateException can be removed.
Also get rid of tests for DateUtils methods that are no longer used.
(The tests are the only thing that use these methods.)
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/DateException.java
rc/com/android/providers/calendar/Duration.java
rc/com/android/providers/calendar/RecurrenceProcessor.java
ests/src/com/android/providers/calendar/DurationTest.java
ests/src/com/android/providers/calendar/RRuleTest.java
ests/src/com/android/providers/calendar/RecurrenceProcessorTest.java
|
| 552e7817bd90c6b7fabadba9a2ff7e43eccf831a |
02-Mar-2010 |
Brian Carlstrom <bdc@google.com> |
Fix _SYNC_LOCAL_ID => to_SYNC_DATA in CalendarSyncTestingBase to fix the build.
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
|
| 550cfa4e2ebb03ec0f28b8bbfd466eef8811ef74 |
02-Mar-2010 |
Marc Blank <mblank@google.com> |
Merge "Handle rename of _SYNC_LOCAL_ID to _SYNC_DATA in Calendar"
|
| c12fe4704e12519756b8da1a3f9199f2013e48f0 |
02-Mar-2010 |
Marc Blank <mblank@google.com> |
Handle rename of _SYNC_LOCAL_ID to _SYNC_DATA in Calendar
* This is being used as a discretionary column by Exchange calendar
sync, so rename to avoid association with old usage
Change-Id: Ifdcc0be10d45d261760ebd36bb6bc270c3f70699
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 9e318a560b6a56e4d8e1a4b2c89cf5d5a922254b |
01-Mar-2010 |
Erik <roboerik@android.com> |
Another fix for widget launching Calendar when no accounts/events exist.
Widget wasn't setting a data string when no events existed, which caused it to be
ignored by calendar. I've moved things around so the data uri always gets set and
only the time field is optionally added to it.
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| 59759558e9dcce17a0f36770180c2a599c399076 |
28-Feb-2010 |
Marc Blank <mblank@google.com> |
Make sure _SYNC_LOCAL_ID is in the entity projection map
* This column was excluded from the projection map, presumably via an
oversight.
* The Exchange sync adapter requires this for sending meeting invite
change emails to attendees
* Remove two superfluous casts, and add an @Override to run
Change-Id: If515f9fc4ad0a2fcd59f93f644f6c104bdbd14e9
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 192b1807d4b6265a4f7581580bd6172dae3fc1b1 |
27-Feb-2010 |
Marc Blank <mblank@google.com> |
Don't delete attendees until Event is finally deleted
* Exchange (and potentially other sync adapters) needs to send cancellation
notices when Events are deleted; this requires that Attendee information
remain intact until the Event is actually deleted (rather than being marked
deleted)
* The change is to move the deletion of Attendee rows until the Event is
actually deleted
* There are also some IDE-compatible formatting changes and a little cleanup
Bug: 2474733
Change-Id: I1fcdfc58bb3341f77b1f1087029db39749851f5e
rc/com/android/providers/calendar/CalendarProvider2.java
|
| c7571fd56b6e54dead620ecf16997ef5df98a18c |
27-Feb-2010 |
Eric Fischer <enf@google.com> |
Merge "Import new translations."
|
| 421c5bafd545f5de66fb2c4878c2b4a6ad238e0e |
27-Feb-2010 |
Eric Fischer <enf@google.com> |
Import new translations.
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
| 7fbdc1fa9e9ea1603948722f8ce971f075da4bb5 |
27-Feb-2010 |
Erik <roboerik@android.com> |
Added flag to ensure intent is always handled.
Currently, if the user presses home from within Calendar and then taps the widget it goes
to the last view the user had up. With this flag it will instead handle the intent from
the widget and go to the start of the next event.
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| 997e2e5cb006682bc1a82441304994b458d9745d |
27-Feb-2010 |
Erik <roboerik@android.com> |
Quick fix to allow starting calendar without a time specified.
rc/com/android/providers/calendar/CalendarProvider2.java
|
| cd639e76e93e5aabfdbccddc5bfe1ca94479dd8f |
27-Feb-2010 |
Erik Pasternak <roboerik@android.com> |
Merge "b/2412594 Changed widget to use an implicit intent."
|
| 48587d3291c4db7f0942e1bff55b88cfa7764ba0 |
24-Feb-2010 |
Erik <roboerik@android.com> |
b/2412594 Changed widget to use an implicit intent.
Added an implicent intent filter to the Calendar launcher so it will no longer be tied
to the package name. The widget is now using that intent to launch the Calendar so it
doesn't have to use a hardcoded package name. Also added uri matching for a time to be
specified as part of the data field in the intent.
rc/com/android/providers/calendar/CalendarAppWidgetService.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| a5ef613c55f3bc68eeeafde67732e53ee229f40d |
26-Feb-2010 |
Chia-chi Yeh <chiachi@android.com> |
Make the tests not depend on gsf.
ests/Android.mk
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
|
| 157f659b2d1df5dfbba59ae010875487b6507446 |
26-Feb-2010 |
Marc Blank <mblank@google.com> |
Merge "Add lastSyncedAttendeeStatus to CalendarProvider2 database"
|
| 162c7c9bbd53b623fbe913b376e7f7f42915bb59 |
25-Feb-2010 |
Marc Blank <mblank@google.com> |
Add lastSyncedAttendeeStatus to CalendarProvider2 database
* This column is intended to be used by those sync adapters that need to
recognize a change in the user's attendee status; it is uninitialized,
so its value, until modified, will be retrieved as zero (no status)
* This column is not used directly by the provider, so that its semantics
are not defined outside of a particular sync adapter
Change-Id: Ibddc6cf3bf7df04e79c8ce919b54f1af5310b4ab
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| b62e426e9ce017e8d5a0c85483a69e12a7b1851c |
25-Feb-2010 |
Dianne Hackborn <hackbod@google.com> |
Update to reflect android-common no longer in framework.
ests/Android.mk
|
| 156ad29fe71eaae73cddad9b17690d1cc8225136 |
25-Feb-2010 |
Ken Shirriff <kens@google.com> |
Use SQL query parameters for reminder lookup.
Due to a complex issue with manifest typing in SQL, a cast is requierd.
bug 2458259 2464440
rc/com/android/providers/calendar/CalendarProvider2.java
|
| b8ea0b2b08f2af0533ecda3102c8fac6643e8713 |
24-Feb-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Merge "Add more unit tests for bug fix #2449594 (device should fold RRULEs, etc., that are longer than 75 chars)"
|
| 2d1b3d70a6ebce8194932f8a8355d97a89da113f |
19-Feb-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #2438401 (Froyo calendar is missing many entries)
We want to keep unsynced calendars from being visible in the UI:
- filter events by sync_event state when doing Instance expansion thru getEntries()
- keep events in the Events table (better than erasing them when a calendar is not syncable)
- change events_view View to be able to get the sync_event state
- add database schema upgrade for the Events view
- clean some comments
Change-Id: I9382fe572db371dfa33b200b6dfd870265c6ffcc
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 852d89fc583863cc083b38d1ae29e715b956d511 |
23-Feb-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Add more unit tests for bug fix #2449594 (device should fold RRULEs, etc., that are longer than 75 chars)
Change-Id: I0b3878577a86eb54cc19f8760c505b5a3d3ba4e4
ests/src/com/android/providers/calendar/RecurrenceSetTest.java
|
| 9323bb1bbb247bac4871595a3de387ec7568897e |
23-Feb-2010 |
Ken Shirriff <kens@google.com> |
Partially revert "Use SQL query arguments."
Due to database bug 2463913, query arguments don't work in this case.
bug 2458259
Also improve comments.
This reverts commit dc538177512191886cc40bc5e5125aae9bb197aa.
rc/com/android/providers/calendar/CalendarProvider2.java
|
| f5f98726435ba8644076b161946df4dd1784cfa7 |
23-Feb-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Merge "Fix manifest to use default package name (com.android.providers.calendar) for CalendarProvider2 process instead of com.android.calendar (the Calendar app pacakage name)"
|
| 241041ee4735c62083ca9a8c1879bb7655fce19e |
23-Feb-2010 |
Ken Shirriff <kens@google.com> |
Fix *#*#CAL#*#*
Was using Events._sync_dirty instead of _sync_dirty
rc/com/android/providers/calendar/CalendarDebug.java
|
| 5bbabdd2f8732a844f28fe545dc2fbf97b2b47e9 |
22-Feb-2010 |
Erik <roboerik@android.com> |
b/2458172 Changed launch intent for widget.
Changed the intent path for launching Calendar from com.android.calendar to com.google.android.calendar.
This change reflects package name changes.
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| 2cc859cab85391a240b9c3f28c935d919c8ceb8c |
01-Feb-2010 |
Ken Shirriff <kens@google.com> |
Unbundling: remove deprecated deleteRow().
Delete calendar through resolver rather than using cursor operation that
isn't in SDK.
rc/com/android/providers/calendar/CalendarProvider2.java
|
| dc538177512191886cc40bc5e5125aae9bb197aa |
19-Feb-2010 |
Ken Shirriff <kens@google.com> |
Use SQL query arguments.
Using static strings makes the SQL cache happy.
rc/com/android/providers/calendar/CalendarProvider2.java
|
| f8de1a9391de5d8b6a6a0ae7c55e1a2c318d6c05 |
16-Feb-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug #2331761 (Instances of a recurring event are missing)
by detecting and ignoring malformed recurrences
Change-Id: Ia669dad297edebd1a34eff839fc0235459f319b1
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/EventRecurrenceTest.java
|
| 9b6911d0eafe434cd561e9cdee556c63c5d3ca32 |
18-Feb-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix manifest to use default package name (com.android.providers.calendar) for CalendarProvider2 process instead of com.android.calendar (the Calendar app pacakage name)
Change-Id: Ia513fe3c97bd8491ab15869981e93454334fda8e
ndroidManifest.xml
|
| 1168e2855bba7e5ae73b5ac8f0461eee269073c9 |
17-Feb-2010 |
Jeff Hamilton <jham@android.com> |
Add in a permission that is used by the provider, but only declared in the UI manifest.
Change-Id: I0a2c7e817f96ec3c285629865cb0e6ba63f0139b
ndroidManifest.xml
|
| 9535627bf6295cd94447beb83e1aac41f50c3600 |
12-Feb-2010 |
Erik <roboerik@android.com> |
b/2441483 Dropped url requirement in CP2.
CP2 will now pass in a null argument when no url is available. This means Sync adapters
are not required to supply a url feed for their calendars and should handle sync status
changes on their own if they don't.
rc/com/android/providers/calendar/CalendarProvider2.java
|
| f09652d7327e45711f0e5b210e4df9c4c4c78ac4 |
13-Feb-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix for bug 2431102 (illegal argument exception / negative CalendarId)
Change-Id: I552083eddd716353f5525eb8ef35ca8b2f7aa598
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 46f3f01b132f97b51ec1f4670769dda499cd9da5 |
12-Feb-2010 |
Ken Shirriff <kens@google.com> |
Remove dependencies on gsf-client and google-common.
Use HashMap and HashSet instead of com.google.android.collect.Maps/Sets. Remove dead code.
bug 2425037
ndroid.mk
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 975efd902429cd72cf1bfabf8663e1893c84a624 |
12-Feb-2010 |
Ken Shirriff <kens@google.com> |
Add unittest for instance expansion.
This tests the case where an event overlaps the instance range and then the
instance range is expanded, so the event is added to the instance table twice.
bug 2439297
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| c874ed5c6cc0fcc6ac06ae7d20db0eab7d749608 |
11-Feb-2010 |
Ken Shirriff <kens@google.com> |
Fix instance expansion.
Was getting a constraint violation due to using insert instead of replace.
bug 2439297
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| dbaad88527665d5144a8a178fa822f58d2bc7d05 |
11-Feb-2010 |
Erik <roboerik@android.com> |
Quick fix for databases where events are missing a timezone.
Added a check to see if a timezone was returned for an event. If one wasn't it uses
UTC as a default timezone.
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| be0733e7f38cabc7eedcb2ee0ed9ab7005439a2f |
10-Feb-2010 |
Erik <roboerik@android.com> |
b/2434881 Dropped not null requirement for dtstart2,dtend2
Calendar was crashing for certain events that contained a null entry in dtend.
Removed the requirement that dtend2 be non-null.
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| e52757ba526ae7fc7267fa932df5979a7b7bbbf9 |
09-Feb-2010 |
Erik Pasternak <roboerik@android.com> |
Merge "b/1522903 First step in converting allday events to local timezone"
|
| 806adc5cdaef3d4554ad77913064b5982ca07108 |
09-Feb-2010 |
Eugene Koh <koh@google.com> |
Merge "Update mdpi resource with 2.0 style icon"
|
| 02f64cd539e05bb1f7d673fc01e8add78b14c346 |
09-Feb-2010 |
Michael Chan <mchan@android.com> |
b/2385751 Update string from No subject to No title
Change-Id: Ic80ae2414b2d89880088a11af2ac4ae322df81f6
es/values/strings.xml
|
| ae4f20e120d3107cef20be860a612c9c23816295 |
08-Feb-2010 |
Erik <roboerik@android.com> |
b/1522903 First step in converting allday events to local timezone
This is the first change for converting allDay events to use the local
timezone instead of being in UTC timezones. This will make dealing with
alarms on allDay events easier to manage and allow us to remove a large
number of checks throughout the code to deal with allDay events
differently.
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 754b6d0e96c7df4cb649a48cde21b72c3dcedf4a |
09-Feb-2010 |
Erik <roboerik@android.com> |
Quick fix for missing version number.
In the db update from vs 60 to 61 the version number didn't get changed, this fixes any
issues this could create.
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 8bd4c5d8a62aaca9a2ef466d4931ef5fd883095e |
08-Feb-2010 |
Bai Tao <michaelbai@google.com> |
Update mdpi resource with 2.0 style icon
es/drawable-mdpi/app_icon.png
|
| fa8440c3ac47963fc7b34584123220f25a3a8a9e |
05-Feb-2010 |
The Android Open Source Project <initial-contribution@android.com> |
am 62cf0ad5: am 2306a400: reconcile main tree with open-source eclair
Merge commit '62cf0ad5bcb18bc85f17b30296882b109b05b290'
* commit '62cf0ad5bcb18bc85f17b30296882b109b05b290':
android-2.1_r1 snapshot
|
| 62cf0ad5bcb18bc85f17b30296882b109b05b290 |
05-Feb-2010 |
The Android Open Source Project <initial-contribution@android.com> |
am 2306a400: reconcile main tree with open-source eclair
Merge commit '2306a40063442fb1c0158ade55a34fc1a59cfb4c' into eclair-plus-aosp
* commit '2306a40063442fb1c0158ade55a34fc1a59cfb4c':
android-2.1_r1 snapshot
|
| 2306a40063442fb1c0158ade55a34fc1a59cfb4c |
05-Feb-2010 |
The Android Open Source Project <initial-contribution@android.com> |
reconcile main tree with open-source eclair
|
| dbcdeda6a33b3ca0cf9ca8288dd87053e83eae48 |
04-Feb-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Merge "Fix bug 1025931 (need to reprocess events table when timezone db changes)"
|
| ae270e35e14b5c7a756050cb8dcccf5771743850 |
03-Feb-2010 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bug 1025931 (need to reprocess events table when timezone db changes)
Change-Id: I4a196c2bf03fcae6cb53807940b7b59345fd4fb8
rc/com/android/providers/calendar/CalendarCache.java
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 96d6212495c3af8c7a5998d955fb8a33b5c16986 |
04-Feb-2010 |
Jeff Hamilton <jham@android.com> |
Fix build issues.
Change-Id: I0a3e1e320e574df2b00c4f2c42093013758f9655
ndroid.mk
|
| 30c0d7ae9d4c410254dc4106fa4ffa692a7e6706 |
01-Feb-2010 |
Ken Shirriff <kens@google.com> |
Add calendar deletion unittest.
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 83512315d187baad2c9dc3ed686cc23676c9f463 |
30-Jan-2010 |
Ken Shirriff <kens@google.com> |
Unbundling: use URI instead of direct provider call for scheduling alarms.
See bug 2407593
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/CalendarReceiver.java
|
| 672fcffa561d3b4aaee0913a7189e20b6a7b6d63 |
29-Jan-2010 |
The Android Open Source Project <initial-contribution@android.com> |
reconcile android-2.1_r1 snapshot
|
| 1fb026913a42aa0708c4d4a444cb37381bc33134 |
29-Jan-2010 |
Jeff Hamilton <jham@android.com> |
Remove obsolete tests.
Change-Id: Ic72214e22cab2bd3ddc1e0e4be8a1ea45a8a7c29
ests/src/com/android/providers/calendar/TestCalendarSyncAdapter.java
|
| 1edaf77a7ef2fbad6b6116dd75591e0aeaff3a16 |
28-Jan-2010 |
Ken Shirriff <kens@google.com> |
Use DateUtils constants.
I thought these weren't in the SDK, but they are.
This partially reverts "Unbundling: remove dependencies on SyncStateContentProviderHelper and DateUtils from CalendarProvider2.", commit c4e53191b570e09959c5723f4d253977ba48f2d0.
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 9f9651d0ccd02a4156a02698fa5fb943ea7dc034 |
28-Jan-2010 |
Ken Shirriff <kens@google.com> |
Merge "Unbundling: Remove SECRET_CODE_ACTION import."
|
| d3c602b07427cfeb90f9796d36f90cbf91dbc9f0 |
28-Jan-2010 |
Ken Shirriff <kens@google.com> |
Unbundling: Remove SECRET_CODE_ACTION import.
The receiver is called only for this action, so it doesn't need to explicitly check.
rc/com/android/providers/calendar/CalendarDebugReceiver.java
|
| 00635105a4c45bb38324fd098ac66d491930fa8e |
28-Jan-2010 |
Ken Shirriff <kens@google.com> |
Remove old CalendarProvider and CalendarSyncAdapter.
CalendarProvider2 has replaced CalendarProvider and the
CalendarSyncAdapter in com.google.android.syncadapters has replaced
this CalendarSyncAdapter.
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarReceiver.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
rc/com/android/providers/calendar/CalendarSyncAdapterService.java
rc/com/android/providers/calendar/VCal.java
ests/src/com/android/providers/calendar/CalendarProviderForTesting.java
ests/src/com/android/providers/calendar/CalendarProviderTest.java
ests/src/com/android/providers/calendar/VCalTest.java
|
| c4e53191b570e09959c5723f4d253977ba48f2d0 |
26-Jan-2010 |
Ken Shirriff <kens@google.com> |
Unbundling: remove dependencies on SyncStateContentProviderHelper and DateUtils from CalendarProvider2.
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 8f4ccb20cce4cd09bd9e0c777d2d5cd92a2c9b78 |
28-Jan-2010 |
Ken Shirriff <kens@google.com> |
Fix calendar reminders.
This is a port to CalendarProvider2 of:
b/2224837 Clean up Alerts/Notifications
Also eliminated stale entries from the Calendar Notification list and keep the message and reminder count in the Notification shade up to date. Before you would see entries for events, instances, or reminders that have been changed or deleted.
Change-Id: I7f02fe378e5907e60b8ba5a99577fda444d69a32
bug 2390838
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 767a744d42f8e271712d65b2877384355b1398a9 |
27-Jan-2010 |
Ken Shirriff <kens@google.com> |
Add ExtendedProperties unittest.
bug 2399618
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 3654f1fa28d8018620de3a5275abeb81b228ee79 |
27-Jan-2010 |
Ken Shirriff <kens@google.com> |
Merge "Unbundling: copy calendarEmailAddressFromFeedUrl method"
|
| e74157e34e174c923032a4b93ad298d0f234879c |
27-Jan-2010 |
Ken Shirriff <kens@google.com> |
Fix CalendarAlerts query.
The alert code expects the color column, which requires the query to be joined with
the calendars table. Also add a unittest.
bug 2390762
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| d39cfe09aa7e752cdc7512ae58d90d49d4b5ef9e |
26-Jan-2010 |
Ken Shirriff <kens@google.com> |
Unbundling: copy calendarEmailAddressFromFeedUrl method
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 8446e6f8d976b7b3ace690837d5fb59c041fab74 |
22-Jan-2010 |
Ken Shirriff <kens@google.com> |
Change calendar authority to com.android.calendar
bug 2388178
ndroidManifest.xml
es/xml/syncadapter.xml
|
| e4f4a414fd1b1424d68bd1efd2a51feba69a1ddb |
22-Jan-2010 |
Ken Shirriff <kens@google.com> |
Merge "Enable CalendarProvider2 and disable CalendarProvider."
|
| 5be95052daa6c35fa2f634086897b84259eae288 |
22-Jan-2010 |
Ken Shirriff <kens@google.com> |
Replace calendar authority with constant.
bug 2388178
rc/com/android/providers/calendar/CalendarReceiver.java
|
| b57f228c23d3672c1f08153f3fcc88ced2011714 |
22-Jan-2010 |
Ken Shirriff <kens@google.com> |
Change hardcoded calendar authority strings to use constants.
This will allow the authority to be changed in the future.
bug 2388178
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
ests/src/com/android/providers/calendar/CalendarProviderTest.java
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
ests/src/com/android/providers/calendar/TestCalendarSyncAdapter.java
|
| 99fec79c9e3e5e94cbe84262a09c2ddfb5b67879 |
22-Jan-2010 |
Ken Shirriff <kens@google.com> |
Enable CalendarProvider2 and disable CalendarProvider.
ndroidManifest.xml
|
| a6101d927be2fc5cccfcd93009e4a155e255884d |
21-Jan-2010 |
Doug Zongker <dougz@android.com> |
relocate GoogleLoginService
Change-Id: I5932a668cdfd4a444d6e95a5d8d670c51215339b
ndroid.mk
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
ests/Android.mk
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
|
| cc2f3a9448fba7a6ee0e4c7d6e2aef21be294af8 |
21-Jan-2010 |
Ken Shirriff <kens@google.com> |
Merge "Add calendar database upgrade code."
|
| 8335a18ac6024f302b50e6f473ad4058cc355c85 |
20-Jan-2010 |
Ken Shirriff <kens@google.com> |
Optimize instance database operations by using selectionArgs.
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 56120dd505f0b89776ae71e93ed4e208e1f15e1d |
20-Jan-2010 |
Ken Shirriff <kens@google.com> |
Disable debug logging by default.
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 636b4fb283b9d2802afd179b20a24f2f5035ee69 |
16-Jan-2010 |
Ken Shirriff <kens@google.com> |
Use fixed sql selects for performance.
rc/com/android/providers/calendar/CalendarProvider2.java
|
| ad37c99d051aa4e2508b940c8dec91ee87f53056 |
15-Jan-2010 |
Ken Shirriff <kens@google.com> |
Add calendar database upgrade code.
This switches the CalendarProvider2 code to use the calendar.db database
and upgrade it in place. The upgrade code from versions 57 and 58 is
copied from CalendarProvider.
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 43556fa5610bd302cb80aa5ddc98af1e2f2d8b18 |
14-Jan-2010 |
Ken Shirriff <kens@google.com> |
b/2363376 Fixed month view loading error.
Converted table expansion request dates to ms format so that it would take the proper
action in the month view.
This is I25aafacf applied to CalendarProvider2.
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 4bfcc7d518397d94adeb2d88818aef515d4209d4 |
13-Jan-2010 |
The Android Open Source Project <initial-contribution@android.com> |
android-2.1_r1 snapshot
es/values-zh-rCN/strings.xml
ests/Android.mk
ests/AndroidManifest.xml
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
ests/src/com/android/providers/calendar/SyncCalendarTest.java
|
| 25aafacfdc4cd610e45333df94b0b2e81d9ff696 |
09-Jan-2010 |
Erik <roboerik@android.com> |
b/2363376 Fixed month view loading error.
Converted table expansion request dates to ms format so that it would take the proper
action in the month view.
rc/com/android/providers/calendar/CalendarProvider.java
|
| 83c55844974ca611a553e704663ed845d84c7930 |
06-Jan-2010 |
Ken Shirriff <kens@google.com> |
Add trigger to keep event account correct.
When an event is inserted, the _sync_account and _sync_account_type will
be updated from the Calendars table.
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 2afb4a4e8ea568e424915bb2814920e44b38b818 |
09-Jan-2010 |
Romain Guy <romainguy@android.com> |
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
es/layout-land/agenda_appwidget.xml
es/layout/agenda_appwidget.xml
|
| 348f0a5b9ef74356c32562ec4136e875fdb6811e |
08-Jan-2010 |
Ken Shirriff <kens@google.com> |
Fix SQL broken by busybits change.
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
|
| 90185cd0857fa5fdc50e8e12c41af6fd4d887934 |
08-Jan-2010 |
Erik Pasternak <roboerik@android.com> |
Merge "b/2293263 Finished removing busyBits."
|
| dbd797d59294d72d7ea9226d10128674b634aaad |
08-Jan-2010 |
Erik <roboerik@android.com> |
b/2293263 Finished removing busyBits.
Removed the rest of the references to busyBits and refactored writeLocked to drop unused
fields (were previously part of busybits). Added revision update code for the db and
removed busybit db code from CalendarDatabaseHelper.
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/MetaData.java
ests/src/com/android/providers/calendar/CalendarProviderTest.java
|
| ec163f83001c92babf2a6357b010bc3cdbd6b100 |
08-Jan-2010 |
Eric Fischer <enf@google.com> |
Merge "Update with latest translations."
|
| df799b13349cecbe6be73bb3fe4d6d45adb2e951 |
08-Jan-2010 |
Doug Zongker <dougz@android.com> |
migrate CalendarProvider from gservices to secure settings
Change-Id: I5f116235473a117477daad8fbf34920392599e00
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 690acf414f5522838203ebc814567c3c4752b44a |
08-Jan-2010 |
Eric Fischer <enf@google.com> |
Update with latest translations.
es/values-zh-rCN/strings.xml
|
| c07771fcc66414d8f266f969bb63670391a17bb8 |
06-Jan-2010 |
Ken Shirriff <kens@google.com> |
Add unittest for Event.loadEvents query
Also clean up debugging logging.
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| a84dbe09d250d1eb058271c1985995166b4f0518 |
07-Jan-2010 |
Ken Shirriff <kens@google.com> |
Merge "Fix calendar projection."
|
| 982cbfe8b4e5af45b06fc5c18ff9e0868378ee40 |
06-Jan-2010 |
Ken Shirriff <kens@google.com> |
Fix calendar projection.
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 263a8c5f662a16b23d0feb7a9ae2709093b34cbb |
06-Jan-2010 |
Ken Shirriff <kens@google.com> |
Remove busybit tests.
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| eaf6b06a00f58aa32e2d7f0646cf7bafef97efab |
06-Jan-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "Do not use a user tag on apps, as it is ignored."
|
| 1ae4c22f15c107cd9f9cd8babaa11005e45e4647 |
05-Jan-2010 |
Ken Shirriff <kens@google.com> |
CalendarProvider2 fixes.
Add support for deleting a selection. Use the event view where appropriate.
Fix problems with conflicting column names. Add unittests. Add some missing
columns to projections. Remove unneeded Calendar joins.
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 85964c62b1f56878c93e9b3c07d335c0880e7c2c |
06-Jan-2010 |
Jean-Baptiste Queru <jbq@google.com> |
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: I2bb67e8c7d5282f1939f9cb43198bf3e15cebbb5
ndroid.mk
|
| 6db535b458146a279bebd4a51d56c1bdfc204528 |
24-Dec-2009 |
Erik <roboerik@android.com> |
b/2293263 Replaced busybit functionality with eventday functionality.
Stripped out references to busybits and replaced with code to request only whether an event
exists for each day. In MetaData only minimal changes were made to prevent breaking the
build as I'm not certain all of the effects it has yet. Will do more complete removal of
busybits along with other references.
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/MetaData.java
|
| ef8089b54085b860089a88dfe860e27cb13bb1c3 |
04-Jan-2010 |
Fred Quintana <fredq@google.com> |
clean up the location of the gdata helper objects
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| a9e3fa478c7427327a9d59276fee92ead815e130 |
22-Dec-2009 |
Tom Taylor <tomtaylor@google.com> |
am f799f32d: am 115def16: Update imports to android-common
Merge commit 'f799f32d7951eb6d51d43ce763a896bda4ec7ea9'
* commit 'f799f32d7951eb6d51d43ce763a896bda4ec7ea9':
Update imports to android-common
|
| f799f32d7951eb6d51d43ce763a896bda4ec7ea9 |
22-Dec-2009 |
Tom Taylor <tomtaylor@google.com> |
am 115def16: Update imports to android-common
Merge commit '115def16fa2da20a0be7105b7d987d8b6fd1f8d9' into eclair-mr2-plus-aosp
* commit '115def16fa2da20a0be7105b7d987d8b6fd1f8d9':
Update imports to android-common
|
| 115def16fa2da20a0be7105b7d987d8b6fd1f8d9 |
21-Dec-2009 |
Tom Taylor <tomtaylor@google.com> |
Update imports to android-common
Several files were moved to android-common. Update all the references
to import those files from the new location.
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
ests/src/com/android/providers/calendar/CalendarProviderTest.java
|
| 76c0653c98d1c57861a351ddbb683a2a832ccbd2 |
18-Dec-2009 |
Ken Shirriff <kens@google.com> |
am 90c987ae: am 205fe71b: Extend and fix CalendarProvider2 unittests.
Merge commit '90c987aeaf57635d510eba92000d725ea5405df5'
* commit '90c987aeaf57635d510eba92000d725ea5405df5':
Extend and fix CalendarProvider2 unittests.
|
| 90c987aeaf57635d510eba92000d725ea5405df5 |
18-Dec-2009 |
Ken Shirriff <kens@google.com> |
am 205fe71b: Extend and fix CalendarProvider2 unittests.
Merge commit '205fe71b416fe4a742310dabed5e813946afc999' into eclair-mr2-plus-aosp
* commit '205fe71b416fe4a742310dabed5e813946afc999':
Extend and fix CalendarProvider2 unittests.
|
| 205fe71b416fe4a742310dabed5e813946afc999 |
16-Dec-2009 |
Ken Shirriff <kens@google.com> |
Extend and fix CalendarProvider2 unittests.
Add multiple calendar test. Fix deleted event test. Test extended properties delete.
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| e4c40ed797d8926fa6f29c1d87f40f3937006446 |
16-Dec-2009 |
Michael Chan <mchan@android.com> |
am b643ef78: am 266045e9: b/2224837 Clean up Alerts/Notifications
Merge commit 'b643ef788ad4db766e983e3f265827e6ae2f69fc'
* commit 'b643ef788ad4db766e983e3f265827e6ae2f69fc':
b/2224837 Clean up Alerts/Notifications
|
| b643ef788ad4db766e983e3f265827e6ae2f69fc |
16-Dec-2009 |
Michael Chan <mchan@android.com> |
am 266045e9: b/2224837 Clean up Alerts/Notifications
Merge commit '266045e9a016d2252b2532881799b8edf27f5327' into eclair-mr2-plus-aosp
* commit '266045e9a016d2252b2532881799b8edf27f5327':
b/2224837 Clean up Alerts/Notifications
|
| 5ce71e617f27863601f03abfe8956f51c5aa2d76 |
15-Dec-2009 |
Android Git Automerger <android-git-automerger@android.com> |
Merge commit 'goog/eclair-plus-aosp'
|
| aa2364ece548bcdd3e86d6953baed97c8265112d |
15-Dec-2009 |
Fred Quintana <fredq@google.com> |
am 32673c3b: am 2ad2455f: Merge change I86397f6c into eclair-mr2
Merge commit '32673c3b173fe55c816463cd6e64d0cd053fd963'
* commit '32673c3b173fe55c816463cd6e64d0cd053fd963':
moved the hidden sync helpers out of the framework
|
| 266045e9a016d2252b2532881799b8edf27f5327 |
19-Nov-2009 |
Michael Chan <mchan@android.com> |
b/2224837 Clean up Alerts/Notifications
Also eliminated stale entries from the Calendar Notification list and keep the message and reminder count in the Notification shade up to date. Before you would see entries for events, instances, or reminders that have been changed or deleted.
Change-Id: I7f02fe378e5907e60b8ba5a99577fda444d69a32
rc/com/android/providers/calendar/CalendarProvider.java
|
| 32673c3b173fe55c816463cd6e64d0cd053fd963 |
15-Dec-2009 |
Fred Quintana <fredq@google.com> |
am 2ad2455f: Merge change I86397f6c into eclair-mr2
Merge commit '2ad2455fcf8cea805b3824c9df1dfd37ae1bcf92' into eclair-mr2-plus-aosp
* commit '2ad2455fcf8cea805b3824c9df1dfd37ae1bcf92':
moved the hidden sync helpers out of the framework
|
| 2ad2455fcf8cea805b3824c9df1dfd37ae1bcf92 |
15-Dec-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I86397f6c into eclair-mr2
* changes:
moved the hidden sync helpers out of the framework
|
| 734ebbc6c7014e93f3ed6eb39260ef125da9e917 |
15-Dec-2009 |
Ken Shirriff <kens@google.com> |
am ba11b9d7: am 595242cb: Add multiple account support to CalendarProvider2.
Merge commit 'ba11b9d78b3ad3d05c76032c9ad2b07654ec75c7'
* commit 'ba11b9d78b3ad3d05c76032c9ad2b07654ec75c7':
Add multiple account support to CalendarProvider2.
|
| ba11b9d78b3ad3d05c76032c9ad2b07654ec75c7 |
15-Dec-2009 |
Ken Shirriff <kens@google.com> |
am 595242cb: Add multiple account support to CalendarProvider2.
Merge commit '595242cb01dc0d2d90b01613ff195b2be7b2559e' into eclair-mr2-plus-aosp
* commit '595242cb01dc0d2d90b01613ff195b2be7b2559e':
Add multiple account support to CalendarProvider2.
|
| b5cb2522cdb260f21c983d9584d6f72b4f85879b |
11-Dec-2009 |
Fred Quintana <fredq@google.com> |
moved the hidden sync helpers out of the framework
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
rc/com/android/providers/calendar/CalendarSyncAdapterService.java
ests/src/com/android/providers/calendar/TestCalendarSyncAdapter.java
|
| 595242cb01dc0d2d90b01613ff195b2be7b2559e |
12-Dec-2009 |
Ken Shirriff <kens@google.com> |
Add multiple account support to CalendarProvider2.
This appends the account information to the appropriate query
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 6080dfafcef0d3ab0a2434fa32bde6eee97247aa |
10-Dec-2009 |
Fred Quintana <fredq@google.com> |
am 5c80b1d2: am 9a72b890: hardcode the google sync gservices settings for now
Merge commit '5c80b1d2534c95a217e60ddd8dcf35352c75e431'
* commit '5c80b1d2534c95a217e60ddd8dcf35352c75e431':
hardcode the google sync gservices settings for now
|
| 042c5416ab122921dff4078f229baaad77fb6898 |
10-Dec-2009 |
Ken Shirriff <kens@google.com> |
am fdc64a19: am 29b5eb9f: Remove default calendar code.
Merge commit 'fdc64a195af7d3924942913362796ae2a43df4b8'
* commit 'fdc64a195af7d3924942913362796ae2a43df4b8':
Remove default calendar code.
|
| 5c80b1d2534c95a217e60ddd8dcf35352c75e431 |
10-Dec-2009 |
Fred Quintana <fredq@google.com> |
am 9a72b890: hardcode the google sync gservices settings for now
Merge commit '9a72b890f28b1c1f2ae870c4c46aa160ef156aa1' into eclair-mr2-plus-aosp
* commit '9a72b890f28b1c1f2ae870c4c46aa160ef156aa1':
hardcode the google sync gservices settings for now
|
| 9a72b890f28b1c1f2ae870c4c46aa160ef156aa1 |
10-Dec-2009 |
Fred Quintana <fredq@google.com> |
hardcode the google sync gservices settings for now
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 0b01289ad5fbdb43a44c22a3b9e49a4c6e92fd46 |
10-Dec-2009 |
Fred Quintana <fredq@google.com> |
am c77eeac8: am 19fb3af2: changed to use the new EntityIterator interface removed the queryEntity case from CalendarProviderTest since it is no longer relevant (we moved on to CalendarProvider2 before fully switching to the Entity reading approach)
Merge commit 'c77eeac8f4830805d66ed950ee208abdc780e45a'
* commit 'c77eeac8f4830805d66ed950ee208abdc780e45a':
changed to use the new EntityIterator interface
|
| fdc64a195af7d3924942913362796ae2a43df4b8 |
10-Dec-2009 |
Ken Shirriff <kens@google.com> |
am 29b5eb9f: Remove default calendar code.
Merge commit '29b5eb9f7400cc3e9edfe21df758780c1f64dc57' into eclair-mr2-plus-aosp
* commit '29b5eb9f7400cc3e9edfe21df758780c1f64dc57':
Remove default calendar code.
|
| c77eeac8f4830805d66ed950ee208abdc780e45a |
10-Dec-2009 |
Fred Quintana <fredq@google.com> |
am 19fb3af2: changed to use the new EntityIterator interface removed the queryEntity case from CalendarProviderTest since it is no longer relevant (we moved on to CalendarProvider2 before fully switching to the Entity reading approach)
Merge commit '19fb3af2ec12621bca575f5518c2ba3831cb3600' into eclair-mr2-plus-aosp
* commit '19fb3af2ec12621bca575f5518c2ba3831cb3600':
changed to use the new EntityIterator interface
|
| 29b5eb9f7400cc3e9edfe21df758780c1f64dc57 |
09-Dec-2009 |
Ken Shirriff <kens@google.com> |
Remove default calendar code.
This has been moved to CalendarSyncAdapter.
rc/com/android/providers/calendar/CalendarProvider2.java
|
| 19fb3af2ec12621bca575f5518c2ba3831cb3600 |
07-Dec-2009 |
Fred Quintana <fredq@google.com> |
changed to use the new EntityIterator interface
removed the queryEntity case from CalendarProviderTest since it is no longer relevant (we moved on to CalendarProvider2 before fully switching to the Entity reading approach)
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarProvider2.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
ests/src/com/android/providers/calendar/CalendarProviderTest.java
|
| 8905321d21b5ff090d4b1477866f22cc2d967085 |
07-Dec-2009 |
Omari Stephens <xsdg@android.com> |
am 506dd2f1: am 937d688a: am d052b316: Fix intermittent race condition in SyncCalendarTests
Merge commit '506dd2f1bb19996fff020275d78390f86514aba8'
* commit '506dd2f1bb19996fff020275d78390f86514aba8':
Fix intermittent race condition in SyncCalendarTests
|
| 52ccba27df6d7b38d6c46c3312808f4a01438b12 |
07-Dec-2009 |
Ken Shirriff <kens@google.com> |
am 2d26f35f: am a7f68700: CalendarProvider2: clean up the code for updating individual events.
Merge commit '2d26f35f72767e0c434cb2edbddce908cf63ad10'
* commit '2d26f35f72767e0c434cb2edbddce908cf63ad10':
CalendarProvider2: clean up the code for updating individual events.
|
| 506dd2f1bb19996fff020275d78390f86514aba8 |
05-Dec-2009 |
Omari Stephens <xsdg@android.com> |
am 937d688a: am d052b316: Fix intermittent race condition in SyncCalendarTests
Merge commit '937d688a3f4124ad9f4a7596c378cb35547e475a' into eclair-mr2-plus-aosp
* commit '937d688a3f4124ad9f4a7596c378cb35547e475a':
Fix intermittent race condition in SyncCalendarTests
|
| 417ba9c6932abfc88c8d2abf95c21bc08e14665f |
05-Dec-2009 |
Omari Stephens <xsdg@android.com> |
am d052b316: Fix intermittent race condition in SyncCalendarTests
Merge commit 'd052b31665e9b65874edc491ff6ffd4939afe34d' into eclair-plus-aosp
* commit 'd052b31665e9b65874edc491ff6ffd4939afe34d':
Fix intermittent race condition in SyncCalendarTests
|
| 937d688a3f4124ad9f4a7596c378cb35547e475a |
05-Dec-2009 |
Omari Stephens <xsdg@android.com> |
am d052b316: Fix intermittent race condition in SyncCalendarTests
Merge commit 'd052b31665e9b65874edc491ff6ffd4939afe34d' into eclair-mr2
* commit 'd052b31665e9b65874edc491ff6ffd4939afe34d':
Fix intermittent race condition in SyncCalendarTests
|
| d052b31665e9b65874edc491ff6ffd4939afe34d |
05-Dec-2009 |
Omari Stephens <xsdg@android.com> |
Fix intermittent race condition in SyncCalendarTests
Fixes this problem, which (presumably) happens when the test starts before
the calendar has been synced:
junit.framework.AssertionFailedError: Daily recurring event should have been deleted. expected:< 1 > but was:< 319 >
at com.android.providers.calendar.SyncCalendarTest.testCreateAndDeleteNewRecurringEvent(SyncCalendarTest.java:54)
[...]
ests/src/com/android/providers/calendar/SyncCalendarTest.java
|
| c4868a039aef3bd790100a0fd420460c3194029a |
04-Dec-2009 |
Ken Shirriff <kens@google.com> |
am ad9c11ea: am cbcc49b6: Merge change I38167f11 into eclair-mr2
Merge commit 'ad9c11ea47cfb4aa010f38fa73dd11de67e277d9'
* commit 'ad9c11ea47cfb4aa010f38fa73dd11de67e277d9':
Add commented-out support for CalendarProvider2.
|
| 2e0d342ae1de0e77ebb300da05feeb9f7d8a0e81 |
04-Dec-2009 |
Ken Shirriff <kens@google.com> |
am 96ce5f14: am 2fb3bc8f: CalendarProvider2: support extended properties delete
Merge commit '96ce5f146b9b0a21ddebfa89c3a2e58d83f0e22b'
* commit '96ce5f146b9b0a21ddebfa89c3a2e58d83f0e22b':
CalendarProvider2: support extended properties delete
|
| 2d26f35f72767e0c434cb2edbddce908cf63ad10 |
04-Dec-2009 |
Ken Shirriff <kens@google.com> |
am a7f68700: CalendarProvider2: clean up the code for updating individual events.
Merge commit 'a7f687007ff4d0c30726bf86f717fde88f51b453' into eclair-mr2-plus-aosp
* commit 'a7f687007ff4d0c30726bf86f717fde88f51b453':
CalendarProvider2: clean up the code for updating individual events.
|
| ad9c11ea47cfb4aa010f38fa73dd11de67e277d9 |
04-Dec-2009 |
Ken Shirriff <kens@google.com> |
am cbcc49b6: Merge change I38167f11 into eclair-mr2
Merge commit 'cbcc49b6bdae2f3039adc31c2888d8824a3d5f44' into eclair-mr2-plus-aosp
* commit 'cbcc49b6bdae2f3039adc31c2888d8824a3d5f44':
Add commented-out support for CalendarProvider2.
|
| 96ce5f146b9b0a21ddebfa89c3a2e58d83f0e22b |
04-Dec-2009 |
Ken Shirriff <kens@google.com> |
am 2fb3bc8f: CalendarProvider2: support extended properties delete
Merge commit '2fb3bc8f9ded55c0e379e1eaed2e036a5670b63a' into eclair-mr2-plus-aosp
* commit '2fb3bc8f9ded55c0e379e1eaed2e036a5670b63a':
CalendarProvider2: support extended properties delete
|
| a7f687007ff4d0c30726bf86f717fde88f51b453 |
23-Nov-2009 |
Ken Shirriff <kens@google.com> |
CalendarProvider2: clean up the code for updating individual events.
This is a bit ugly; the ContentProviderOperation generates an _id=n selection string,
rather than the /id URL that is normally used, so we need to handle it here as a special
case for the sync adapter.
rc/com/android/providers/calendar/CalendarProvider2.java
|
| cbcc49b6bdae2f3039adc31c2888d8824a3d5f44 |
04-Dec-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I38167f11 into eclair-mr2
* changes:
Add commented-out support for CalendarProvider2.
|
| 2fb3bc8f9ded55c0e379e1eaed2e036a5670b63a |
04-Dec-2009 |
Ken Shirriff <kens@google.com> |
CalendarProvider2: support extended properties delete
This is needed for syncing extended properties.
Also check for unsupported selection args.
Also clean up comments.
rc/com/android/providers/calendar/CalendarProvider2.java
|
| a969e942aae1263828ecae909481f2be837be4cf |
19-Oct-2009 |
Ken Shirriff <kens@google.com> |
Add commented-out support for CalendarProvider2.
CalendarProvider2 supports the new calendar sync adapter.
ndroidManifest.xml
|
| 9f0d41dca2f56973d2feefddf556a68ca51d4613 |
25-Nov-2009 |
Ken Shirriff <kens@google.com> |
am cc18c30e: am 02e55646: Merge change I5a7cf57f into eclair-mr2
Merge commit 'cc18c30e3a128a8259f3b4a3bda1de374b658cf4'
* commit 'cc18c30e3a128a8259f3b4a3bda1de374b658cf4':
New calendar sync framework: code review changes, support delete, support multiple calendars, remove triggers.
|
| cc18c30e3a128a8259f3b4a3bda1de374b658cf4 |
25-Nov-2009 |
Ken Shirriff <kens@google.com> |
am 02e55646: Merge change I5a7cf57f into eclair-mr2
Merge commit '02e5564690b3bb30d4f9cebfff7e4b94009098ba' into eclair-mr2-plus-aosp
* commit '02e5564690b3bb30d4f9cebfff7e4b94009098ba':
New calendar sync framework: code review changes, support delete, support multiple calendars, remove triggers.
|
| 02e5564690b3bb30d4f9cebfff7e4b94009098ba |
25-Nov-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I5a7cf57f into eclair-mr2
* changes:
New calendar sync framework: code review changes, support delete, support multiple calendars, remove triggers.
|
| b48e7d088b22f7a60efa141f93a7496a7a509acf |
24-Nov-2009 |
Fred Quintana <fredq@google.com> |
am 87f82470: am 7c58d880: moved the gdata library to vendor/google
Merge commit '87f8247061242d7f2c57e7c3269ea1a5ca3f06a3'
* commit '87f8247061242d7f2c57e7c3269ea1a5ca3f06a3':
moved the gdata library to vendor/google
|
| 87f8247061242d7f2c57e7c3269ea1a5ca3f06a3 |
24-Nov-2009 |
Fred Quintana <fredq@google.com> |
am 7c58d880: moved the gdata library to vendor/google
Merge commit '7c58d880e23e401e472f0dbe87b01bbfaf8ac692' into eclair-mr2-plus-aosp
* commit '7c58d880e23e401e472f0dbe87b01bbfaf8ac692':
moved the gdata library to vendor/google
|
| 7c58d880e23e401e472f0dbe87b01bbfaf8ac692 |
24-Nov-2009 |
Fred Quintana <fredq@google.com> |
moved the gdata library to vendor/google
ndroid.mk
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| eca60e903a9c9d5f317e376f02f922ccccb533d2 |
23-Nov-2009 |
Fred Quintana <fredq@google.com> |
am d0187680: am 860f89a0: move SubscribedFeeds to GSF
Merge commit 'd0187680aad358c9ae45d6a5c78975620768ff3b'
* commit 'd0187680aad358c9ae45d6a5c78975620768ff3b':
move SubscribedFeeds to GSF
|
| d0187680aad358c9ae45d6a5c78975620768ff3b |
23-Nov-2009 |
Fred Quintana <fredq@google.com> |
am 860f89a0: move SubscribedFeeds to GSF
Merge commit '860f89a0e6ffda7050b5d86b25850b0c2234252a' into eclair-mr2-plus-aosp
* commit '860f89a0e6ffda7050b5d86b25850b0c2234252a':
move SubscribedFeeds to GSF
|
| 860f89a0e6ffda7050b5d86b25850b0c2234252a |
23-Nov-2009 |
Fred Quintana <fredq@google.com> |
move SubscribedFeeds to GSF
ndroid.mk
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 7e3ec5f2025164fca508f81a5a01940bc912e064 |
02-Nov-2009 |
Ken Shirriff <kens@google.com> |
New calendar sync framework: code review changes, support delete, support multiple calendars, remove triggers.
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/CalendarReceiver.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| 8d11cb8c8827a773a96c0723d564a7f2aacab048 |
17-Nov-2009 |
Ken Shirriff <kens@google.com> |
am 7b4c55af: am e1d0a552: Merge change I0151a6db into eclair-mr2
Merge commit '7b4c55af057a6ace6c133ba53db3bff9e32c182b'
* commit '7b4c55af057a6ace6c133ba53db3bff9e32c182b':
Add CalendarProvider unittests.
|
| 7b4c55af057a6ace6c133ba53db3bff9e32c182b |
17-Nov-2009 |
Ken Shirriff <kens@google.com> |
am e1d0a552: Merge change I0151a6db into eclair-mr2
Merge commit 'e1d0a552ca7ec0eb81af15580287a74e018c0a33' into eclair-mr2-plus-aosp
* commit 'e1d0a552ca7ec0eb81af15580287a74e018c0a33':
Add CalendarProvider unittests.
|
| e1d0a552ca7ec0eb81af15580287a74e018c0a33 |
17-Nov-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I0151a6db into eclair-mr2
* changes:
Add CalendarProvider unittests.
|
| 7aebd93451c1d5c80bd94100c3ba58c479bb2d87 |
16-Nov-2009 |
Ken Shirriff <kens@google.com> |
Add CalendarProvider unittests.
Test the dirty flag behavior and calendar deletion behavior. These tests will
prevent regression when moving to the updated calendar provider.
ests/src/com/android/providers/calendar/CalendarProviderTest.java
|
| 2ff48e0d951205abdd3c33727a013617e0eccff8 |
16-Nov-2009 |
Ken Shirriff <kens@google.com> |
am f851419c: am 8ec98208: Add database upgrade for ExtendeProperties trigger.
Merge commit 'f851419ca46cfac43c79119c2d38aaeb1611d40e'
* commit 'f851419ca46cfac43c79119c2d38aaeb1611d40e':
Add database upgrade for ExtendeProperties trigger.
|
| 03ee6ac6f12627e159e5e61ec3623c974f6b5616 |
16-Nov-2009 |
Ken Shirriff <kens@google.com> |
am f233cebe: am f45a30bb: Merge change I55eb40e7 into eclair-mr2
Merge commit 'f233cebe7cd0e31480a52d660b3327621b1d3a80'
* commit 'f233cebe7cd0e31480a52d660b3327621b1d3a80':
Fix ExtendedProperties trigger.
|
| f851419ca46cfac43c79119c2d38aaeb1611d40e |
16-Nov-2009 |
Ken Shirriff <kens@google.com> |
am 8ec98208: Add database upgrade for ExtendeProperties trigger.
Merge commit '8ec98208827ff649612891c486be2d132a812f25' into eclair-mr2-plus-aosp
* commit '8ec98208827ff649612891c486be2d132a812f25':
Add database upgrade for ExtendeProperties trigger.
|
| f233cebe7cd0e31480a52d660b3327621b1d3a80 |
16-Nov-2009 |
Ken Shirriff <kens@google.com> |
am f45a30bb: Merge change I55eb40e7 into eclair-mr2
Merge commit 'f45a30bb81fcaac1745d860e521352aa216cfdd9' into eclair-mr2-plus-aosp
* commit 'f45a30bb81fcaac1745d860e521352aa216cfdd9':
Fix ExtendedProperties trigger.
|
| 8ec98208827ff649612891c486be2d132a812f25 |
16-Nov-2009 |
Ken Shirriff <kens@google.com> |
Add database upgrade for ExtendeProperties trigger.
This should have been in Change I55eb40e7. We don't currently use these triggers,
but I'm fixing them both for correctness and so I can add unittests to this code.
rc/com/android/providers/calendar/CalendarProvider.java
|
| f45a30bb81fcaac1745d860e521352aa216cfdd9 |
16-Nov-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I55eb40e7 into eclair-mr2
* changes:
Fix ExtendedProperties trigger.
|
| 678e4c33a25a6b0cfa8a816713017c96f404f711 |
16-Nov-2009 |
Jean-Baptiste Queru <jbq@google.com> |
am 2fb21d2b: merge from open-source master
Merge commit '2fb21d2b4dfdb2ffda23360988e0f821487111f8'
* commit '2fb21d2b4dfdb2ffda23360988e0f821487111f8':
handle the case where the subscribed feeds provider is not present
eclair snapshot
|
| 2fb21d2b4dfdb2ffda23360988e0f821487111f8 |
15-Nov-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from open-source master
|
| 784776f7445d91ec3d7a70004d21e6c150e12c02 |
15-Nov-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
|
| 953bf194a83c1f6c4bbdaeb717cac339dc3d4739 |
15-Nov-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from open-source master
Merge commit 'goog/stage-korg-master^' into HEAD
|
| eea38a1ad7a61b4426612222a654da610e02855a |
12-Nov-2009 |
Fred Quintana <fredq@google.com> |
handle the case where the subscribed feeds provider is not present
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 3c4b743e10c88ebb6ef05005a3b3cbb5d43dbece |
15-Nov-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from eclair
|
| 55eb40e72a9cfd416926ecd55a49256b759e86b9 |
14-Nov-2009 |
Ken Shirriff <kens@google.com> |
Fix ExtendedProperties trigger.
Currently, inserts or deletes of ExtendedProperties don't mark the event as dirty.
rc/com/android/providers/calendar/CalendarProvider.java
|
| 7a303471f2b8a7465aaeb9e4708a0afb246d8682 |
14-Nov-2009 |
Eric Fischer <enf@google.com> |
am e42f200d: (-s ours) am e34ff587: am 159534b4: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'e42f200de0e0b2f50b6521210a9da2df337f27fd'
* commit 'e42f200de0e0b2f50b6521210a9da2df337f27fd':
Import revised translations. DO NOT MERGE
|
| e42f200de0e0b2f50b6521210a9da2df337f27fd |
14-Nov-2009 |
Eric Fischer <enf@google.com> |
am e34ff587: am 159534b4: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'e34ff5875b704851f524ffafaa60bd998316bcdb' into eclair-mr2-plus-aosp
* commit 'e34ff5875b704851f524ffafaa60bd998316bcdb':
Import revised translations. DO NOT MERGE
|
| e34ff5875b704851f524ffafaa60bd998316bcdb |
14-Nov-2009 |
Eric Fischer <enf@google.com> |
am 159534b4: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '159534b4013fe1516b96e20ba787e21f9e2362fb' into eclair-mr2
* commit '159534b4013fe1516b96e20ba787e21f9e2362fb':
Import revised translations. DO NOT MERGE
|
| 7e2610ecf626fc804095812e8f1a18499544bdc9 |
14-Nov-2009 |
Eric Fischer <enf@google.com> |
am 159534b4: Import revised translations. DO NOT MERGE
Merge commit '159534b4013fe1516b96e20ba787e21f9e2362fb' into eclair-plus-aosp
* commit '159534b4013fe1516b96e20ba787e21f9e2362fb':
Import revised translations. DO NOT MERGE
|
| 159534b4013fe1516b96e20ba787e21f9e2362fb |
14-Nov-2009 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
Approver: jerryw
es/values-zh-rCN/strings.xml
|
| 24b79995faa0adce8e4fc9662b7b45388251a30c |
13-Nov-2009 |
Omari Stephens <xsdg@android.com> |
am 78c2b99c: am 5067d053: am 5b13ed3c: Update old tests so they compile and run
Merge commit '78c2b99c5ef1c55164a5e2b0f8a713ce4a9b3307'
* commit '78c2b99c5ef1c55164a5e2b0f8a713ce4a9b3307':
Update old tests so they compile and run
|
| 74b3bba3a895b1feeb5e536db1cab2ddef5b77ec |
13-Nov-2009 |
Omari Stephens <xsdg@android.com> |
am 56346e0e: am 6f7889a7: am 36219115: Pull Calendar sync tests from old device tree
Merge commit '56346e0eddaf4c5b89749a16e9f8f0e838d08537'
* commit '56346e0eddaf4c5b89749a16e9f8f0e838d08537':
Pull Calendar sync tests from old device tree
|
| 78c2b99c5ef1c55164a5e2b0f8a713ce4a9b3307 |
13-Nov-2009 |
Omari Stephens <xsdg@android.com> |
am 5067d053: am 5b13ed3c: Update old tests so they compile and run
Merge commit '5067d053ceef224bb1a04e09d01a4a6c49443628' into eclair-mr2-plus-aosp
* commit '5067d053ceef224bb1a04e09d01a4a6c49443628':
Update old tests so they compile and run
|
| 56346e0eddaf4c5b89749a16e9f8f0e838d08537 |
13-Nov-2009 |
Omari Stephens <xsdg@android.com> |
am 6f7889a7: am 36219115: Pull Calendar sync tests from old device tree
Merge commit '6f7889a7625d91cc981d6694f7bf1767d0d62938' into eclair-mr2-plus-aosp
* commit '6f7889a7625d91cc981d6694f7bf1767d0d62938':
Pull Calendar sync tests from old device tree
|
| 5067d053ceef224bb1a04e09d01a4a6c49443628 |
13-Nov-2009 |
Omari Stephens <xsdg@android.com> |
am 5b13ed3c: Update old tests so they compile and run
Merge commit '5b13ed3cd9373fc384fdce2d1c358dad61128954' into eclair-mr2
* commit '5b13ed3cd9373fc384fdce2d1c358dad61128954':
Update old tests so they compile and run
|
| 6f7889a7625d91cc981d6694f7bf1767d0d62938 |
13-Nov-2009 |
Omari Stephens <xsdg@android.com> |
am 36219115: Pull Calendar sync tests from old device tree
Merge commit '36219115c4ba93dc934dfd9c92d56ef81be0340b' into eclair-mr2
* commit '36219115c4ba93dc934dfd9c92d56ef81be0340b':
Pull Calendar sync tests from old device tree
|
| 08396a24ae2b3c1680bfba29d9e837f8a6022c72 |
13-Nov-2009 |
Omari Stephens <xsdg@android.com> |
am 5b13ed3c: Update old tests so they compile and run
Merge commit '5b13ed3cd9373fc384fdce2d1c358dad61128954' into eclair-plus-aosp
* commit '5b13ed3cd9373fc384fdce2d1c358dad61128954':
Update old tests so they compile and run
|
| 6f433bd4fbc3630e32ed9d2e667ed7a0a8f9fe59 |
13-Nov-2009 |
Omari Stephens <xsdg@android.com> |
am 36219115: Pull Calendar sync tests from old device tree
Merge commit '36219115c4ba93dc934dfd9c92d56ef81be0340b' into eclair-plus-aosp
* commit '36219115c4ba93dc934dfd9c92d56ef81be0340b':
Pull Calendar sync tests from old device tree
|
| 979896b75145118c3efb136151e7b177d3c113b1 |
13-Nov-2009 |
Jean-Baptiste Queru <jbq@google.com> |
eclair snapshot
ndroidManifest.xml
es/drawable-hdpi/app_icon.png
es/drawable-hdpi/appwidget_bg.9.png
es/drawable-hdpi/appwidget_bg_focus.9.png
es/drawable-hdpi/appwidget_bg_press.9.png
es/drawable-hdpi/appwidget_calendar_bgtop_blue.9.png
es/drawable-hdpi/white_list_rule_cal.9.png
es/drawable-mdpi/app_icon.png
es/drawable-mdpi/appwidget_bg.9.png
es/drawable-mdpi/appwidget_bg_focus.9.png
es/drawable-mdpi/appwidget_bg_press.9.png
es/drawable-mdpi/appwidget_calendar_bgtop_blue.9.png
es/drawable-mdpi/white_list_rule_cal.9.png
es/drawable/app_icon.png
es/drawable/appwidget_background.xml
es/drawable/appwidget_bg.9.png
es/drawable/white_list_rule_cal.9.png
es/layout-land/agenda_appwidget.xml
es/layout/agenda_appwidget.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values/colors.xml
es/values/dimens.xml
es/values/strings.xml
es/xml/syncadapter.xml
rc/com/android/providers/calendar/CalendarAppWidgetService.java
rc/com/android/providers/calendar/CalendarDebug.java
rc/com/android/providers/calendar/CalendarDebugReceiver.java
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
rc/com/android/providers/calendar/CalendarSyncAdapterService.java
ests/AndroidManifest.xml
ests/src/com/android/providers/calendar/CalendarProviderTest.java
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
ests/src/com/android/providers/calendar/SyncCalendarTest.java
ests/src/com/android/providers/calendar/TestCalendarSyncAdapter.java
|
| 5b13ed3cd9373fc384fdce2d1c358dad61128954 |
12-Nov-2009 |
Omari Stephens <xsdg@android.com> |
Update old tests so they compile and run
ests/Android.mk
ests/AndroidManifest.xml
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
ests/src/com/android/providers/calendar/SyncCalendarTest.java
|
| 36219115c4ba93dc934dfd9c92d56ef81be0340b |
12-Nov-2009 |
Omari Stephens <xsdg@android.com> |
Pull Calendar sync tests from old device tree
Originally lived at //device/content/tests/providers/calendar/src/com/android/providers/calendar/SyncCalendarTest.java
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
ests/src/com/android/providers/calendar/SyncCalendarTest.java
|
| 38ffb2f570ad5a7d2426dead637cf38e29de3366 |
11-Nov-2009 |
Ken Shirriff <kens@google.com> |
am 7315151a: am 935606cf: Merge change I12bbe40a into eclair-mr2
Merge commit '7315151a49ed0e2d5d2505672179813591d01514'
* commit '7315151a49ed0e2d5d2505672179813591d01514':
Add new CalendarProvider2 for new sync framework.
|
| 7315151a49ed0e2d5d2505672179813591d01514 |
11-Nov-2009 |
Ken Shirriff <kens@google.com> |
am 935606cf: Merge change I12bbe40a into eclair-mr2
Merge commit '935606cfd0c168349ef51949050a4229b0240826' into eclair-mr2-plus-aosp
* commit '935606cfd0c168349ef51949050a4229b0240826':
Add new CalendarProvider2 for new sync framework.
|
| 935606cfd0c168349ef51949050a4229b0240826 |
10-Nov-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I12bbe40a into eclair-mr2
* changes:
Add new CalendarProvider2 for new sync framework.
|
| 58453ace9f162d458abba6e970e243bcba83ac18 |
30-Oct-2009 |
Eric Fischer <enf@google.com> |
am 528a5725: (-s ours) am 9e5f1913: am b4f5cda3: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '528a57250c100d14f1d2c9cd559778235ec52798'
* commit '528a57250c100d14f1d2c9cd559778235ec52798':
Import revised translations. DO NOT MERGE
|
| 528a57250c100d14f1d2c9cd559778235ec52798 |
30-Oct-2009 |
Eric Fischer <enf@google.com> |
am 9e5f1913: am b4f5cda3: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '9e5f191343c479116ff86262ae2416fc7c08dedc' into eclair-mr2-plus-aosp
* commit '9e5f191343c479116ff86262ae2416fc7c08dedc':
Import revised translations. DO NOT MERGE
|
| 9e5f191343c479116ff86262ae2416fc7c08dedc |
30-Oct-2009 |
Eric Fischer <enf@google.com> |
am b4f5cda3: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'b4f5cda3fe87ccc09bd901450dc97c7bf7bc57b6' into eclair-mr2
* commit 'b4f5cda3fe87ccc09bd901450dc97c7bf7bc57b6':
Import revised translations. DO NOT MERGE
|
| b2736465003f31c6fb911fe10ac7417ac676af8f |
29-Oct-2009 |
Brett Chabot <brettchabot@android.com> |
am eda7f529: (-s ours) am d21c1ad5: am 9dbaf3ea: (-s ours) Merge change I80332800 into eclair
Merge commit 'eda7f5299fa27290906de8be7a029731f55445c2'
* commit 'eda7f5299fa27290906de8be7a029731f55445c2':
Temporarily disable flaky test CalendarProviderTest#testInstanceRange DO NOT MERGE
|
| 9e2566e8fd58d0f52172a95a430f69e89de25ed8 |
29-Oct-2009 |
Mike Cleron <mcleron@google.com> |
am e3a8c15e: am ca3a90c2: am b0b1eb16: New widgets
Merge commit 'e3a8c15e3c6f89e0aba289f6d64d793959fdb324'
* commit 'e3a8c15e3c6f89e0aba289f6d64d793959fdb324':
New widgets
|
| eda7f5299fa27290906de8be7a029731f55445c2 |
29-Oct-2009 |
Brett Chabot <brettchabot@android.com> |
am d21c1ad5: am 9dbaf3ea: (-s ours) Merge change I80332800 into eclair
Merge commit 'd21c1ad592b036104cc363ad644346f01599e553' into eclair-mr2-plus-aosp
* commit 'd21c1ad592b036104cc363ad644346f01599e553':
Temporarily disable flaky test CalendarProviderTest#testInstanceRange DO NOT MERGE
|
| e3a8c15e3c6f89e0aba289f6d64d793959fdb324 |
29-Oct-2009 |
Mike Cleron <mcleron@google.com> |
am ca3a90c2: am b0b1eb16: New widgets
Merge commit 'ca3a90c264663857a44024123181f97e9b41acf5' into eclair-mr2-plus-aosp
* commit 'ca3a90c264663857a44024123181f97e9b41acf5':
New widgets
|
| d21c1ad592b036104cc363ad644346f01599e553 |
29-Oct-2009 |
Brett Chabot <brettchabot@android.com> |
am 9dbaf3ea: (-s ours) Merge change I80332800 into eclair
Merge commit '9dbaf3eaf067cce1adcdd942c3ac6cad4d4eb380' into eclair-mr2
* commit '9dbaf3eaf067cce1adcdd942c3ac6cad4d4eb380':
Temporarily disable flaky test CalendarProviderTest#testInstanceRange DO NOT MERGE
|
| ca3a90c264663857a44024123181f97e9b41acf5 |
29-Oct-2009 |
Mike Cleron <mcleron@google.com> |
am b0b1eb16: New widgets
Merge commit 'b0b1eb163e763258c94785906b7517ad54b3bb8d' into eclair-mr2
* commit 'b0b1eb163e763258c94785906b7517ad54b3bb8d':
New widgets
|
| f6393b95f17507e4b06505f9d4f1041ccb7e5592 |
29-Oct-2009 |
Eric Fischer <enf@google.com> |
am b4f5cda3: Import revised translations. DO NOT MERGE
Merge commit 'b4f5cda3fe87ccc09bd901450dc97c7bf7bc57b6' into eclair-plus-aosp
* commit 'b4f5cda3fe87ccc09bd901450dc97c7bf7bc57b6':
Import revised translations. DO NOT MERGE
|
| b4f5cda3fe87ccc09bd901450dc97c7bf7bc57b6 |
29-Oct-2009 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
es/values-nb/strings.xml
|
| e1c53ef8e3a32c6c992cc7483d632d71dd716ee4 |
28-Oct-2009 |
Brett Chabot <brettchabot@android.com> |
am 9dbaf3ea: Merge change I80332800 into eclair
Merge commit '9dbaf3eaf067cce1adcdd942c3ac6cad4d4eb380' into eclair-plus-aosp
* commit '9dbaf3eaf067cce1adcdd942c3ac6cad4d4eb380':
Temporarily disable flaky test CalendarProviderTest#testInstanceRange DO NOT MERGE
|
| 9dbaf3eaf067cce1adcdd942c3ac6cad4d4eb380 |
28-Oct-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I80332800 into eclair
* changes:
Temporarily disable flaky test CalendarProviderTest#testInstanceRange DO NOT MERGE
|
| a07e06958d5d6c86cf979f0aa4cca675c903ef5e |
28-Oct-2009 |
Brett Chabot <brettchabot@android.com> |
Temporarily disable flaky test CalendarProviderTest#testInstanceRange DO NOT MERGE
Bug 2218280
ests/src/com/android/providers/calendar/CalendarProviderTest.java
|
| a48e07f84191ac26dcc8811a0a4415d907cafdaa |
27-Oct-2009 |
Mike Cleron <mcleron@google.com> |
am b0b1eb16: New widgets
Merge commit 'b0b1eb163e763258c94785906b7517ad54b3bb8d' into eclair-plus-aosp
* commit 'b0b1eb163e763258c94785906b7517ad54b3bb8d':
New widgets
|
| 9f005e4843925efe4fa8434361c4ad4ad384ed4c |
27-Oct-2009 |
Ken Shirriff <kens@google.com> |
Add new CalendarProvider2 for new sync framework.
This provider operates directly, rather than through a TempProviderSyncAdapter.
rc/com/android/providers/calendar/CalendarDatabaseHelper.java
rc/com/android/providers/calendar/CalendarProvider2.java
rc/com/android/providers/calendar/SQLiteContentProvider.java
ests/src/com/android/providers/calendar/CalendarProvider2ForTesting.java
ests/src/com/android/providers/calendar/CalendarProvider2Test.java
|
| b0b1eb163e763258c94785906b7517ad54b3bb8d |
27-Oct-2009 |
Mike Cleron <mcleron@google.com> |
New widgets
es/drawable-hdpi/appwidget_bg.9.png
es/drawable-hdpi/appwidget_bg_focus.9.png
es/drawable-hdpi/appwidget_bg_press.9.png
es/drawable-hdpi/appwidget_calendar_bgtop_blue.9.png
es/drawable-mdpi/appwidget_bg.9.png
es/drawable-mdpi/appwidget_bg_focus.9.png
es/drawable-mdpi/appwidget_bg_press.9.png
es/drawable-mdpi/appwidget_calendar_bgtop_blue.9.png
es/drawable/appwidget_background.xml
es/drawable/appwidget_bg.xml
es/layout-land/agenda_appwidget.xml
es/layout/agenda_appwidget.xml
es/values/colors.xml
es/values/dimens.xml
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| a767f375aeeea59c3a51cf56707695f5a873fe24 |
22-Oct-2009 |
Eric Fischer <enf@google.com> |
am 39dd4a68: (-s ours) am 3c6cd8e5: am e4033250: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '39dd4a684e5f67765c74d85fe8a68141fadd6ef9'
* commit '39dd4a684e5f67765c74d85fe8a68141fadd6ef9':
Import revised translations. DO NOT MERGE
|
| 39dd4a684e5f67765c74d85fe8a68141fadd6ef9 |
22-Oct-2009 |
Eric Fischer <enf@google.com> |
am 3c6cd8e5: am e4033250: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '3c6cd8e5cf9ae0c9669ca5d74dbe3041775da323' into eclair-mr2-plus-aosp
* commit '3c6cd8e5cf9ae0c9669ca5d74dbe3041775da323':
Import revised translations. DO NOT MERGE
|
| 3c6cd8e5cf9ae0c9669ca5d74dbe3041775da323 |
22-Oct-2009 |
Eric Fischer <enf@google.com> |
am e4033250: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'e4033250e6208dc57672b110a1f17858812bc459' into eclair-mr2
* commit 'e4033250e6208dc57672b110a1f17858812bc459':
Import revised translations. DO NOT MERGE
|
| 22c103e5578ccbeff36ba5690eb4ae14fa89d0bb |
21-Oct-2009 |
Eric Fischer <enf@google.com> |
am e4033250: Import revised translations. DO NOT MERGE
Merge commit 'e4033250e6208dc57672b110a1f17858812bc459' into eclair-plus-aosp
* commit 'e4033250e6208dc57672b110a1f17858812bc459':
Import revised translations. DO NOT MERGE
|
| e4033250e6208dc57672b110a1f17858812bc459 |
21-Oct-2009 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
Approver: jerryw
es/values-nb/strings.xml
|
| 8a9172020fb7eb4deef2bd30131aed8ad2bb0103 |
19-Oct-2009 |
Ken Shirriff <kens@google.com> |
am ff9a4c4b: am 1cbb8659: Add Calendar URL to EntityIterator.
Merge commit 'ff9a4c4b94243979aa64da13de3c696162f88c3a'
* commit 'ff9a4c4b94243979aa64da13de3c696162f88c3a':
Add Calendar URL to EntityIterator.
|
| ff9a4c4b94243979aa64da13de3c696162f88c3a |
19-Oct-2009 |
Ken Shirriff <kens@google.com> |
am 1cbb8659: Add Calendar URL to EntityIterator.
Merge commit '1cbb86593128799a05d17d61c21d62b19f124707' into eclair-mr2-plus-aosp
* commit '1cbb86593128799a05d17d61c21d62b19f124707':
Add Calendar URL to EntityIterator.
|
| 1cbb86593128799a05d17d61c21d62b19f124707 |
19-Oct-2009 |
Ken Shirriff <kens@google.com> |
Add Calendar URL to EntityIterator.
This adds the Calendar URL to the Entity query for CalendarProvider.
rc/com/android/providers/calendar/CalendarProvider.java
ests/src/com/android/providers/calendar/CalendarProviderTest.java
|
| 1d5e465e03896575303aeefee4883d93bba2d0ce |
15-Oct-2009 |
Jean-Baptiste Queru <jbq@google.com> |
am 728176ed: merge from open-source master
Merge commit '728176ed522e65e662da66f315ef5f450bc4f49f'
* commit '728176ed522e65e662da66f315ef5f450bc4f49f':
|
| 728176ed522e65e662da66f315ef5f450bc4f49f |
15-Oct-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from open-source master
|
| dd2313461d72519075c887824d9a59d05bad5369 |
14-Oct-2009 |
Ken Shirriff <kens@google.com> |
am ba5aa5da: CalendarProviderTest: close iterator.
Merge commit 'ba5aa5da91fa621b0c498b7340548dbd04f3fbd7'
* commit 'ba5aa5da91fa621b0c498b7340548dbd04f3fbd7':
CalendarProviderTest: close iterator.
|
| d09a9c1dd462cd6db464b7cc5bd3fc7b2cff31ad |
14-Oct-2009 |
Ken Shirriff <kens@google.com> |
am ef2d8bbc: Fix CalendarProvider test race.
Merge commit 'ef2d8bbc06d7613983637f54c2790c7349b765d4'
* commit 'ef2d8bbc06d7613983637f54c2790c7349b765d4':
Fix CalendarProvider test race.
|
| b6283083f58890ac8557ab191bc5f1a173d5877f |
14-Oct-2009 |
Eric Fischer <enf@google.com> |
Reimport translations.
Change-Id: I509b5fc09e8f90ee527756ff537b2cb2219e3da9
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
| 6e0df2e7181a7427ec482f87c6df0298f2dd07f7 |
13-Oct-2009 |
Eric Fischer <enf@google.com> |
am c692fd49: (-s ours) am b0472e21: (-s ours) am 8361d166: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'c692fd492255cd44dd01ab784a615182f2ef4326'
* commit 'c692fd492255cd44dd01ab784a615182f2ef4326':
Import revised translations. DO NOT MERGE
|
| ba5aa5da91fa621b0c498b7340548dbd04f3fbd7 |
12-Oct-2009 |
Ken Shirriff <kens@google.com> |
CalendarProviderTest: close iterator.
This fixes a couple warnings about cursors not closed before finalizing.
ests/src/com/android/providers/calendar/CalendarProviderTest.java
|
| 8159fc30e5c5a34d2d559aeb0c556b6b632363d9 |
12-Oct-2009 |
Fred Quintana <fredq@google.com> |
am bde29af9: account manager api review changes
Merge commit 'bde29af962d7e3d073dc9bcae4ee2e9609a2eeb3'
* commit 'bde29af962d7e3d073dc9bcae4ee2e9609a2eeb3':
account manager api review changes
|
| ef2d8bbc06d7613983637f54c2790c7349b765d4 |
09-Oct-2009 |
Ken Shirriff <kens@google.com> |
Fix CalendarProvider test race.
The CalendarProvider has a background thread to do timezone updates. This
background thread causes problems with unittests because it may try to access
the database after it has been closed. This change prevents the background
thread from being created when testing.
rc/com/android/providers/calendar/CalendarProvider.java
ests/src/com/android/providers/calendar/CalendarProviderForTesting.java
ests/src/com/android/providers/calendar/CalendarProviderTest.java
|
| 5ce347035b3f80f38a5d7539412c4e9ab48ffe33 |
08-Oct-2009 |
Eric Fischer <enf@google.com> |
am b0472e21: am 8361d166: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'b0472e21a9e06f5bba29aa8b7ff2735888ef7624' into eclair-plus-aosp
* commit 'b0472e21a9e06f5bba29aa8b7ff2735888ef7624':
Import revised translations. DO NOT MERGE
|
| c692fd492255cd44dd01ab784a615182f2ef4326 |
08-Oct-2009 |
Eric Fischer <enf@google.com> |
am b0472e21: (-s ours) am 8361d166: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'b0472e21a9e06f5bba29aa8b7ff2735888ef7624' into eclair-mr2
* commit 'b0472e21a9e06f5bba29aa8b7ff2735888ef7624':
Import revised translations. DO NOT MERGE
|
| b0472e21a9e06f5bba29aa8b7ff2735888ef7624 |
08-Oct-2009 |
Eric Fischer <enf@google.com> |
am 8361d166: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '8361d1661bc3fcdb4e671825865a0a671342bf91' into eclair
* commit '8361d1661bc3fcdb4e671825865a0a671342bf91':
Import revised translations. DO NOT MERGE
|
| 885c36581076300175342f6930300a7576577c5d |
07-Oct-2009 |
Fred Quintana <fredq@google.com> |
am bde29af9: account manager api review changes
Merge commit 'bde29af962d7e3d073dc9bcae4ee2e9609a2eeb3' into eclair-plus-aosp
* commit 'bde29af962d7e3d073dc9bcae4ee2e9609a2eeb3':
account manager api review changes
|
| bde29af962d7e3d073dc9bcae4ee2e9609a2eeb3 |
03-Oct-2009 |
Fred Quintana <fredq@google.com> |
account manager api review changes
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| d6871713ceab942cd8851d97eb83775d0dfab0cb |
01-Oct-2009 |
Mike Cleron <mcleron@google.com> |
am a321a35a: am d99ba11a: Fix widgets
Merge commit 'a321a35a6a7a7a1e62a8a3948fd891afae690504'
* commit 'a321a35a6a7a7a1e62a8a3948fd891afae690504':
Fix widgets
|
| 073bd1a1c6bbb908ff49d9efdb7f5cb10565ce70 |
01-Oct-2009 |
Mike Cleron <mcleron@google.com> |
am 5a93b2ce: am cb781a24: Merge change I96079b86 into eclair
Merge commit '5a93b2ced5669093bd4e28710ba8e354fa815b1d'
* commit '5a93b2ced5669093bd4e28710ba8e354fa815b1d':
Newer icons
|
| c233f492ef95779467c3629ea7e13d36d8c29ab8 |
01-Oct-2009 |
Costin Manolache <costin@google.com> |
am 16eebf82: am 01801ea8: Merge change I71c41a7c into eclair
Merge commit '16eebf82aa73c0a0092e92a336967ed2ced2310e'
* commit '16eebf82aa73c0a0092e92a336967ed2ced2310e':
Remove GAIA string
|
| e00df5eaf1cd3c6577cf66066dc6c60602d9a26b |
01-Oct-2009 |
Mike Cleron <mcleron@google.com> |
am 5574c472: am 1b185281: Merge change If4966def into eclair
Merge commit '5574c4720a866e7100c7599197d795ebd5ad10ee'
* commit '5574c4720a866e7100c7599197d795ebd5ad10ee':
New icons
|
| 626839603087fce543f7a5f2c6e399106cd1ed09 |
01-Oct-2009 |
Debajit Ghosh <debajit@google.com> |
am b18d8e6f: am 9ac1b4e5: fix old typo in calendar subscription logic -- we want subscriptions for sync\'d calendars, not selected calendars. remove unused imports.
Merge commit 'b18d8e6f12f032c9bb2be724967666cef9e318bc'
* commit 'b18d8e6f12f032c9bb2be724967666cef9e318bc':
fix old typo in calendar subscription logic -- we want subscriptions for sync'd calendars, not selected calendars.
|
| a321a35a6a7a7a1e62a8a3948fd891afae690504 |
01-Oct-2009 |
Mike Cleron <mcleron@google.com> |
am d99ba11a: Fix widgets
Merge commit 'd99ba11a4172e3b6a7812c6d8b2691951be0f9c8' into eclair-plus-aosp
* commit 'd99ba11a4172e3b6a7812c6d8b2691951be0f9c8':
Fix widgets
|
| d99ba11a4172e3b6a7812c6d8b2691951be0f9c8 |
01-Oct-2009 |
Mike Cleron <mcleron@google.com> |
Fix widgets
es/drawable-hdpi/appwidget_bg.9.png
es/drawable-hdpi/appwidget_bg.xml
es/drawable-hdpi/appwidget_bg_focus.9.png
es/drawable-hdpi/appwidget_bg_normal.9.png
es/drawable-hdpi/appwidget_bg_press.9.png
es/drawable-hdpi/appwidget_bg_pressed.9.png
es/drawable-hdpi/appwidget_bg_selected.9.png
es/drawable-mdpi/appwidget_bg.9.png
es/drawable-mdpi/appwidget_bg_focus.9.png
es/drawable-mdpi/appwidget_bg_press.9.png
es/drawable/appwidget_bg.xml
es/drawable/appwidget_bg_normal.9.png
es/drawable/appwidget_bg_pressed.9.png
es/drawable/appwidget_bg_selected.9.png
|
| 5a93b2ced5669093bd4e28710ba8e354fa815b1d |
30-Sep-2009 |
Mike Cleron <mcleron@google.com> |
am cb781a24: Merge change I96079b86 into eclair
Merge commit 'cb781a245cea273dcc7d124bda6d98a4c15343ce' into eclair-plus-aosp
* commit 'cb781a245cea273dcc7d124bda6d98a4c15343ce':
Newer icons
|
| cb781a245cea273dcc7d124bda6d98a4c15343ce |
30-Sep-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I96079b86 into eclair
* changes:
Newer icons
|
| 96079b86e16e7d05d5d15d2cfd113ff4e44b289b |
30-Sep-2009 |
Mike Cleron <mcleron@google.com> |
Newer icons
es/drawable-hdpi/app_icon.png
|
| 16eebf82aa73c0a0092e92a336967ed2ced2310e |
30-Sep-2009 |
Costin Manolache <costin@google.com> |
am 01801ea8: Merge change I71c41a7c into eclair
Merge commit '01801ea8ebfde46969dbc562ffbaecb09f015cd7' into eclair-plus-aosp
* commit '01801ea8ebfde46969dbc562ffbaecb09f015cd7':
Remove GAIA string
|
| 01801ea8ebfde46969dbc562ffbaecb09f015cd7 |
30-Sep-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I71c41a7c into eclair
* changes:
Remove GAIA string
|
| 71c41a7c5048dd17d093a66dc46cded2c4f854ea |
30-Sep-2009 |
Costin Manolache <costin@google.com> |
Remove GAIA string
es/xml/syncadapter.xml
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 8361d1661bc3fcdb4e671825865a0a671342bf91 |
30-Sep-2009 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
es/values-da/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-ko/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
|
| 5574c4720a866e7100c7599197d795ebd5ad10ee |
29-Sep-2009 |
Mike Cleron <mcleron@google.com> |
am 1b185281: Merge change If4966def into eclair
Merge commit '1b185281fc1efdd345a0d2fb8be501278d81c104' into eclair-plus-aosp
* commit '1b185281fc1efdd345a0d2fb8be501278d81c104':
New icons
|
| 1b185281fc1efdd345a0d2fb8be501278d81c104 |
29-Sep-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change If4966def into eclair
* changes:
New icons
|
| f4966defa122ec33c07507cb2c01487d0fb42a57 |
29-Sep-2009 |
Mike Cleron <mcleron@google.com> |
New icons
es/drawable-hdpi/app_icon.png
|
| b18d8e6f12f032c9bb2be724967666cef9e318bc |
29-Sep-2009 |
Debajit Ghosh <debajit@google.com> |
am 9ac1b4e5: fix old typo in calendar subscription logic -- we want subscriptions for sync\'d calendars, not selected calendars. remove unused imports.
Merge commit '9ac1b4e5645b1c76e8d8adc46920ee82c9ddbf71' into eclair-plus-aosp
* commit '9ac1b4e5645b1c76e8d8adc46920ee82c9ddbf71':
fix old typo in calendar subscription logic -- we want subscriptions for sync'd calendars, not selected calendars.
|
| 9ac1b4e5645b1c76e8d8adc46920ee82c9ddbf71 |
29-Sep-2009 |
Debajit Ghosh <debajit@google.com> |
fix old typo in calendar subscription logic -- we want subscriptions for sync'd calendars, not selected calendars.
remove unused imports.
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 3f43ecc646693250e2dda2a98875bb15ff722566 |
28-Sep-2009 |
Ken Shirriff <kens@google.com> |
am a89f067f: am 253d7965: Add checks to moveToFirst() calls.
Merge commit 'a89f067f18cbf4b316894ec5ab4ae3384ee96cce'
* commit 'a89f067f18cbf4b316894ec5ab4ae3384ee96cce':
Add checks to moveToFirst() calls.
|
| c6300d3f27ccd033f8b0b184755f00896985ae43 |
28-Sep-2009 |
Debajit Ghosh <debajit@google.com> |
am cb1fd7b9: am f2329e1c: Merge change 27333 into eclair
Merge commit 'cb1fd7b951b839e60d0f2ecbce44bee3da19cacc'
* commit 'cb1fd7b951b839e60d0f2ecbce44bee3da19cacc':
convert id to full-selfattendance as well.
|
| 19575e6acd7bc0d524bf9df3eae9436f6c8bc46f |
28-Sep-2009 |
Ken Shirriff <kens@google.com> |
am d4fc1fbd: am 0a806bc8: Add calendar organizer to event on create.
Merge commit 'd4fc1fbd2f565946d64407a1432b4b69aebfd500'
* commit 'd4fc1fbd2f565946d64407a1432b4b69aebfd500':
Add calendar organizer to event on create.
|
| f9f5fae1c34a7921d3316d8f2d369a089fa96d59 |
28-Sep-2009 |
Debajit Ghosh <debajit@google.com> |
am 9be5788a: am eecfe7eb: process the proxy\'s new hint that it is hiding guests. also convert some getLong()s to getInt()s for some boolean bits.
Merge commit '9be5788aeb1c5608c0e75ceea8bf8c0e169ab339'
* commit '9be5788aeb1c5608c0e75ceea8bf8c0e169ab339':
process the proxy's new hint that it is hiding guests.
|
| 422ce85caf6293c4e7c80d79c3445f0e6f42cf0f |
28-Sep-2009 |
Michael Chan <mchan@android.com> |
am 0b9b89c9: am ed144339: Merge change 27227 into eclair
Merge commit '0b9b89c9a98c33f6fae4aa406ee2db799001f566'
* commit '0b9b89c9a98c33f6fae4aa406ee2db799001f566':
b/2099363 Added assets for Calendar Widget
|
| a89f067f18cbf4b316894ec5ab4ae3384ee96cce |
28-Sep-2009 |
Ken Shirriff <kens@google.com> |
am 253d7965: Add checks to moveToFirst() calls.
Merge commit '253d7965816118357422dd8e07a8506aaea76148' into eclair-plus-aosp
* commit '253d7965816118357422dd8e07a8506aaea76148':
Add checks to moveToFirst() calls.
|
| 253d7965816118357422dd8e07a8506aaea76148 |
28-Sep-2009 |
Ken Shirriff <kens@google.com> |
Add checks to moveToFirst() calls.
The code assumed in multiple places that moveToFirst() would always succeed.
This caused several crashes.
rc/com/android/providers/calendar/CalendarProvider.java
|
| cb1fd7b951b839e60d0f2ecbce44bee3da19cacc |
28-Sep-2009 |
Debajit Ghosh <debajit@google.com> |
am f2329e1c: Merge change 27333 into eclair
Merge commit 'f2329e1c1c56cdcf587e634811280c0358a61e61' into eclair-plus-aosp
* commit 'f2329e1c1c56cdcf587e634811280c0358a61e61':
convert id to full-selfattendance as well.
|
| f2329e1c1c56cdcf587e634811280c0358a61e61 |
28-Sep-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 27333 into eclair
* changes:
convert id to full-selfattendance as well. check for null before doing conversion. fix typo where we were inserting an extra / as part of conversion.
|
| 9df37987987ab65c675181b71211f33a2e31192a |
28-Sep-2009 |
Debajit Ghosh <debajit@google.com> |
convert id to full-selfattendance as well.
check for null before doing conversion.
fix typo where we were inserting an extra / as part of conversion.
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 83aadc4f028661c28033157366b192fd51a3c34f |
28-Sep-2009 |
Ken Shirriff <kens@google.com> |
am 9e280682: am a68e844e: Add hasAttendeeData support.
Merge commit '9e2806823221fda4b721a364a2c7f0cac3b3c838'
* commit '9e2806823221fda4b721a364a2c7f0cac3b3c838':
Add hasAttendeeData support.
|
| d4fc1fbd2f565946d64407a1432b4b69aebfd500 |
27-Sep-2009 |
Ken Shirriff <kens@google.com> |
am 0a806bc8: Add calendar organizer to event on create.
Merge commit '0a806bc86641c558552f7a827b99a9d9d2893463' into eclair-plus-aosp
* commit '0a806bc86641c558552f7a827b99a9d9d2893463':
Add calendar organizer to event on create.
|
| 9be5788aeb1c5608c0e75ceea8bf8c0e169ab339 |
27-Sep-2009 |
Debajit Ghosh <debajit@google.com> |
am eecfe7eb: process the proxy\'s new hint that it is hiding guests. also convert some getLong()s to getInt()s for some boolean bits.
Merge commit 'eecfe7eb5eac739aeb34f90344ac600393c7775f' into eclair-plus-aosp
* commit 'eecfe7eb5eac739aeb34f90344ac600393c7775f':
process the proxy's new hint that it is hiding guests.
|
| 0a806bc86641c558552f7a827b99a9d9d2893463 |
26-Sep-2009 |
Ken Shirriff <kens@google.com> |
Add calendar organizer to event on create.
When an event is created, the CalendarProvider should add the organizer field.
This data is client-only, and is not sent to the server.
Also change behavior of SELF_ATTENDEE_STATUS to create Attendees entry for
the owner (email in the calendar URL) rather than for the _sync_account
(the user accessing the calendar). It appears the old behavior was
wrong for shared calendars.
rc/com/android/providers/calendar/CalendarProvider.java
|
| eecfe7eb5eac739aeb34f90344ac600393c7775f |
27-Sep-2009 |
Debajit Ghosh <debajit@google.com> |
process the proxy's new hint that it is hiding guests.
also convert some getLong()s to getInt()s for some boolean bits.
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 0b9b89c9a98c33f6fae4aa406ee2db799001f566 |
26-Sep-2009 |
Michael Chan <mchan@android.com> |
am ed144339: Merge change 27227 into eclair
Merge commit 'ed144339fffa79098305f5491655e3e0af777f2c' into eclair-plus-aosp
* commit 'ed144339fffa79098305f5491655e3e0af777f2c':
b/2099363 Added assets for Calendar Widget
|
| ed144339fffa79098305f5491655e3e0af777f2c |
26-Sep-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 27227 into eclair
* changes:
b/2099363 Added assets for Calendar Widget
|
| fd060976fffd39889d402621fa27369ecd09533c |
26-Sep-2009 |
Michael Chan <mchan@android.com> |
b/2099363 Added assets for Calendar Widget
Change-Id: I35e200c0fd805a707ee44fc9439d5311b9804e29
es/drawable-hdpi/appwidget_bg.xml
es/drawable-hdpi/appwidget_bg_normal.9.png
es/drawable-hdpi/appwidget_bg_pressed.9.png
es/drawable-hdpi/appwidget_bg_selected.9.png
es/drawable/appwidget_bg_normal.9.png
es/drawable/appwidget_bg_pressed.9.png
es/drawable/appwidget_bg_selected.9.png
|
| 9e2806823221fda4b721a364a2c7f0cac3b3c838 |
26-Sep-2009 |
Ken Shirriff <kens@google.com> |
am a68e844e: Add hasAttendeeData support.
Merge commit 'a68e844e8e78368607aba494ac69816667b108b5' into eclair-plus-aosp
* commit 'a68e844e8e78368607aba494ac69816667b108b5':
Add hasAttendeeData support.
|
| a68e844e8e78368607aba494ac69816667b108b5 |
26-Sep-2009 |
Ken Shirriff <kens@google.com> |
Add hasAttendeeData support.
This flag indicates that the full feed (rather than the full-selfattendance) is being
used, so the attendees table contains all the attendees, rather than just self.
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| bbe43e5eda7b8e41a02a80c51fb96074f6aaaadc |
25-Sep-2009 |
Daniel Sandler <dsandler@google.com> |
am bc07c3c4: am f12a5d1f: New hdpi artwork (less obsolete appwidget_bg.9.png).
Merge commit 'bc07c3c45ef7dd454d36b4cfb4b8a56e7c40123d'
* commit 'bc07c3c45ef7dd454d36b4cfb4b8a56e7c40123d':
New hdpi artwork (less obsolete appwidget_bg.9.png).
|
| bc07c3c45ef7dd454d36b4cfb4b8a56e7c40123d |
24-Sep-2009 |
Daniel Sandler <dsandler@google.com> |
am f12a5d1f: New hdpi artwork (less obsolete appwidget_bg.9.png).
Merge commit 'f12a5d1f22b642f0e93c7b3cf282f8f9192c7c0b' into eclair-plus-aosp
* commit 'f12a5d1f22b642f0e93c7b3cf282f8f9192c7c0b':
New hdpi artwork (less obsolete appwidget_bg.9.png).
|
| f12a5d1f22b642f0e93c7b3cf282f8f9192c7c0b |
24-Sep-2009 |
Daniel Sandler <dsandler@google.com> |
New hdpi artwork (less obsolete appwidget_bg.9.png).
es/drawable-hdpi/app_icon.png
es/drawable-hdpi/white_list_rule_cal.9.png
es/drawable-mdpi/app_icon.png
es/drawable-mdpi/white_list_rule_cal.9.png
es/drawable/app_icon.png
es/drawable/white_list_rule_cal.9.png
|
| e084988b5d121ccb858c5f93ead769c6def5671a |
20-Sep-2009 |
Debajit Ghosh <debajit@google.com> |
am 49711865: am f9a4fecb: handle calendars with an access level of "root".
Merge commit '4971186573fb21e1d93406955e31dd0964815d9d'
* commit '4971186573fb21e1d93406955e31dd0964815d9d':
handle calendars with an access level of "root".
|
| 4971186573fb21e1d93406955e31dd0964815d9d |
20-Sep-2009 |
Debajit Ghosh <debajit@google.com> |
am f9a4fecb: handle calendars with an access level of "root".
Merge commit 'f9a4fecbb78809854df0d43b26541fe2b00078fe' into eclair-plus-aosp
* commit 'f9a4fecbb78809854df0d43b26541fe2b00078fe':
handle calendars with an access level of "root".
|
| f9a4fecbb78809854df0d43b26541fe2b00078fe |
19-Sep-2009 |
Debajit Ghosh <debajit@google.com> |
handle calendars with an access level of "root".
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 67f0f4c8fab292de48ed0515d82caa2a69ae3302 |
18-Sep-2009 |
Eric Fischer <enf@google.com> |
am de412e95: (-s ours) am 7811a2df: Import revised translations. DO NOT MERGE
Merge commit 'de412e950c640397a53948c38ee8710cc1364b2d'
* commit 'de412e950c640397a53948c38ee8710cc1364b2d':
Import revised translations. DO NOT MERGE
|
| de412e950c640397a53948c38ee8710cc1364b2d |
18-Sep-2009 |
Eric Fischer <enf@google.com> |
am 7811a2df: Import revised translations. DO NOT MERGE
Merge commit '7811a2dfdb056057ba6a20ce48ef08cf154c79cd' into eclair-plus-aosp
* commit '7811a2dfdb056057ba6a20ce48ef08cf154c79cd':
Import revised translations. DO NOT MERGE
|
| 7811a2dfdb056057ba6a20ce48ef08cf154c79cd |
17-Sep-2009 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
| c73d7cf420508d5db9e5db1c0cee3285a2ac1297 |
17-Sep-2009 |
Ken Shirriff <kens@google.com> |
am e1ff89b0: am 77eb616c: Fix CalendarProviderTest database corruption.
Merge commit 'e1ff89b08d89d407d91224db8bffa4bfd7686016'
* commit 'e1ff89b08d89d407d91224db8bffa4bfd7686016':
Fix CalendarProviderTest database corruption.
|
| e1ff89b08d89d407d91224db8bffa4bfd7686016 |
17-Sep-2009 |
Ken Shirriff <kens@google.com> |
am 77eb616c: Fix CalendarProviderTest database corruption.
Merge commit '77eb616c7199103cfeaa8aa308e4f28370771ee4' into eclair-plus-aosp
* commit '77eb616c7199103cfeaa8aa308e4f28370771ee4':
Fix CalendarProviderTest database corruption.
|
| 77eb616c7199103cfeaa8aa308e4f28370771ee4 |
17-Sep-2009 |
Ken Shirriff <kens@google.com> |
Fix CalendarProviderTest database corruption.
a) Make sure the database is closed between tests.
b) Hack to ensure that the CalendarProvider.TimezoneChecker thread
finishes before testAttendees finishes, so it doesn't access the closed
database.
ests/src/com/android/providers/calendar/CalendarProviderTest.java
|
| 8941e7042cf4002df7bfb51a49217adc7350ff4e |
15-Sep-2009 |
Ken Shirriff <kens@google.com> |
am 4af1076f: am e1ecd58c: Support only primary account for calendar.
Merge commit '4af1076f5fadbd062398f1d811d080886778c367'
* commit '4af1076f5fadbd062398f1d811d080886778c367':
Support only primary account for calendar.
|
| 4af1076f5fadbd062398f1d811d080886778c367 |
11-Sep-2009 |
Ken Shirriff <kens@google.com> |
am e1ecd58c: Support only primary account for calendar.
Merge commit 'e1ecd58c710cf02805a1893b65257af3c6bbb39d' into eclair-plus-aosp
* commit 'e1ecd58c710cf02805a1893b65257af3c6bbb39d':
Support only primary account for calendar.
|
| e1ecd58c710cf02805a1893b65257af3c6bbb39d |
11-Sep-2009 |
Ken Shirriff <kens@google.com> |
Support only primary account for calendar.
The CalendarProvider needs to filter out non-primary accounts from
the Calendars table.
rc/com/android/providers/calendar/CalendarProvider.java
|
| 965883b0fedd17bc84316d7ac4f7dd54b255f981 |
10-Sep-2009 |
Michael Chan <mchan@android.com> |
am 0ef3ca1f: am e952a788: Merge change 24396 into eclair
Merge commit '0ef3ca1f6eb75feb99f82e87b154f1fb46a0b7d2'
* commit '0ef3ca1f6eb75feb99f82e87b154f1fb46a0b7d2':
b/2092525 Fixed the organizer column in CalendarProvider. Edit Menu should appear again.
|
| 8d6ef180c5ae51f4bf951f2d296aec163dfb8136 |
10-Sep-2009 |
Michael Chan <mchan@android.com> |
am bfd4ca47: am 2c1016f2: b/2099363 Added selected and pressed background assets for Calendar Widget
Merge commit 'bfd4ca47852c5ae29942238c016173d115763778'
* commit 'bfd4ca47852c5ae29942238c016173d115763778':
b/2099363 Added selected and pressed background assets for Calendar Widget
|
| 0ef3ca1f6eb75feb99f82e87b154f1fb46a0b7d2 |
10-Sep-2009 |
Michael Chan <mchan@android.com> |
am e952a788: Merge change 24396 into eclair
Merge commit 'e952a7880138705644cc3b31f112229fc89530b6' into eclair-plus-aosp
* commit 'e952a7880138705644cc3b31f112229fc89530b6':
b/2092525 Fixed the organizer column in CalendarProvider. Edit Menu should appear again.
|
| bfd4ca47852c5ae29942238c016173d115763778 |
10-Sep-2009 |
Michael Chan <mchan@android.com> |
am 2c1016f2: b/2099363 Added selected and pressed background assets for Calendar Widget
Merge commit '2c1016f273d06c01144ea6caa58580e3ce163a50' into eclair-plus-aosp
* commit '2c1016f273d06c01144ea6caa58580e3ce163a50':
b/2099363 Added selected and pressed background assets for Calendar Widget
|
| e952a7880138705644cc3b31f112229fc89530b6 |
09-Sep-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 24396 into eclair
* changes:
b/2092525 Fixed the organizer column in CalendarProvider. Edit Menu should appear again.
|
| 2c1016f273d06c01144ea6caa58580e3ce163a50 |
09-Sep-2009 |
Michael Chan <mchan@android.com> |
b/2099363 Added selected and pressed background assets for Calendar Widget
es/drawable/appwidget_bg.9.png
es/drawable/appwidget_bg.xml
es/drawable/appwidget_bg_normal.9.png
es/drawable/appwidget_bg_pressed.9.png
es/drawable/appwidget_bg_selected.9.png
es/layout-land/agenda_appwidget.xml
es/layout/agenda_appwidget.xml
|
| 57d5c04c28cec6148e497682b6086de99383dd06 |
09-Sep-2009 |
Michael Chan <mchan@android.com> |
b/2092525 Fixed the organizer column in CalendarProvider. Edit Menu should appear again.
rc/com/android/providers/calendar/CalendarProvider.java
|
| 58fb2c033b7b3ce598a46a4fe9edbf4bfd488cd3 |
09-Sep-2009 |
Eric Fischer <enf@google.com> |
am d8bbad6b: (-s ours) am 992dc2fe: Import revised translations. DO NOT MERGE
Merge commit 'd8bbad6bdf745e5acc1de40d6faeb77ee1885df0'
* commit 'd8bbad6bdf745e5acc1de40d6faeb77ee1885df0':
Import revised translations. DO NOT MERGE
|
| d8bbad6bdf745e5acc1de40d6faeb77ee1885df0 |
09-Sep-2009 |
Eric Fischer <enf@google.com> |
am 992dc2fe: Import revised translations. DO NOT MERGE
Merge commit '992dc2fea430e660fb244c9d7b6710bf8d3c639d' into eclair-plus-aosp
* commit '992dc2fea430e660fb244c9d7b6710bf8d3c639d':
Import revised translations. DO NOT MERGE
|
| 992dc2fea430e660fb244c9d7b6710bf8d3c639d |
09-Sep-2009 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
| 5a82f17c631949695f6ac3a820bd695e2222a793 |
04-Sep-2009 |
Jean-Baptiste Queru <jbq@google.com> |
am 6001525d: merge from open-source master
Merge commit '6001525ddc544f520eb7a79d70af63fec9fd5fb9'
* commit '6001525ddc544f520eb7a79d70af63fec9fd5fb9':
|
| 6001525ddc544f520eb7a79d70af63fec9fd5fb9 |
04-Sep-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from open-source master
|
| 01e1ff8e112e8861fb013a601d8a2e9f91e7a8e7 |
03-Sep-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from donut
|
| 08e55c2f9caeb5774513af18c72d4611e67492c0 |
02-Sep-2009 |
Michael Chan <mchan@android.com> |
am 7a5bf8dc: b/2091163 Fixed the clipping problem in the landscape version of the Calendar Widget by moving the "x more event" line to the upper right.
Merge commit '7a5bf8dc55f3e41589754ffde8079b1d4b1c35c9'
* commit '7a5bf8dc55f3e41589754ffde8079b1d4b1c35c9':
b/2091163 Fixed the clipping problem in the landscape version of the Calendar Widget by moving the "x more event" line to the upper right.
|
| 7a5bf8dc55f3e41589754ffde8079b1d4b1c35c9 |
01-Sep-2009 |
Michael Chan <mchan@android.com> |
b/2091163 Fixed the clipping problem in the landscape version of the Calendar Widget by moving the "x more event" line to the upper right.
es/layout-land/agenda_appwidget.xml
|
| c57333cbdfa74c6d6303501a2f107bf123a03017 |
01-Sep-2009 |
Ken Shirriff <kens@google.com> |
am e760b01f: Merge change 22367 into eclair
Merge commit 'e760b01f4db25e8001c543990b8bfdf30e527752'
* commit 'e760b01f4db25e8001c543990b8bfdf30e527752':
Add calendar sliding window gservices setting.
|
| e760b01f4db25e8001c543990b8bfdf30e527752 |
31-Aug-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 22367 into eclair
* changes:
Add calendar sliding window gservices setting.
|
| 2048a59ae53cef1e6dd439c4cb1a33c40595e612 |
26-Aug-2009 |
Fred Quintana <fredq@google.com> |
am 76f0f064: clean up the too many deletes dialog
Merge commit '76f0f064d14c391ea45ae4e31ccc445b8e7ea03d'
* commit '76f0f064d14c391ea45ae4e31ccc445b8e7ea03d':
clean up the too many deletes dialog
|
| 76f0f064d14c391ea45ae4e31ccc445b8e7ea03d |
26-Aug-2009 |
Fred Quintana <fredq@google.com> |
clean up the too many deletes dialog
ndroidManifest.xml
es/values/strings.xml
|
| 47c436394f35ca5e5da3492696de02112bd0eeb4 |
22-Aug-2009 |
Ken Shirriff <kens@google.com> |
am 363e04c2: Fix initial calendar feed.
Merge commit '363e04c2ab2e268293bf4024b8b3bdb55daa38f1'
* commit '363e04c2ab2e268293bf4024b8b3bdb55daa38f1':
Fix initial calendar feed.
|
| 0939d60cb31b7f9e46b4f597a899d7ec12e244c9 |
22-Aug-2009 |
Ken Shirriff <kens@google.com> |
Add calendar sliding window gservices setting.
The GOOGLE_CALENDAR_SYNC_WINDOW_DAYS setting will control how often
the sliding window is advanced.
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 363e04c2ab2e268293bf4024b8b3bdb55daa38f1 |
22-Aug-2009 |
Ken Shirriff <kens@google.com> |
Fix initial calendar feed.
Feed should be full, not full-selfattendance.
bug=2071618
rc/com/android/providers/calendar/CalendarProvider.java
|
| 755dad27252eddb480a96ea9647ca85a07b61b3c |
21-Aug-2009 |
Fred Quintana <fredq@google.com> |
am 5a7bd8a5: add the reset() method to EntityIterator
Merge commit '5a7bd8a55ee01059f08d2f67415f2d083d1aa19a'
* commit '5a7bd8a55ee01059f08d2f67415f2d083d1aa19a':
add the reset() method to EntityIterator
|
| 5a7bd8a55ee01059f08d2f67415f2d083d1aa19a |
21-Aug-2009 |
Fred Quintana <fredq@google.com> |
add the reset() method to EntityIterator
rc/com/android/providers/calendar/CalendarProvider.java
|
| b7d01eeeb3e45d15be5330d5c9a3ac783e88042a |
21-Aug-2009 |
Ken Shirriff <kens@google.com> |
am c8de4c62: Merge change 22192 into eclair
Merge commit 'c8de4c624a701d943ba5d2139e19a9fc226d60df'
* commit 'c8de4c624a701d943ba5d2139e19a9fc226d60df':
Fix selfAttendanceStatus.
|
| c8de4c624a701d943ba5d2139e19a9fc226d60df |
21-Aug-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 22192 into eclair
* changes:
Fix selfAttendanceStatus.
|
| 7c46027dc3768105d428e30b2e91ede3ad718356 |
21-Aug-2009 |
Ken Shirriff <kens@google.com> |
Fix selfAttendanceStatus.
Add ownerAccount to temp provider projection so the calendar's owner
can be obtained. This is needed for determining which attendee status
is relevant.
bug=2065008
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 05a720b34932030dfd065d7931d3fc12c148a5f0 |
20-Aug-2009 |
Ken Shirriff <kens@google.com> |
am 101f8d28: Fix handleInstanceQuery.
Merge commit '101f8d28e1143914b6f51d6614d53f815d8207c5'
* commit '101f8d28e1143914b6f51d6614d53f815d8207c5':
Fix handleInstanceQuery.
|
| 101f8d28e1143914b6f51d6614d53f815d8207c5 |
20-Aug-2009 |
Ken Shirriff <kens@google.com> |
Fix handleInstanceQuery.
handleInstanceQuery takes either days or ms as argument depending on a
flag, but didn't expand the instances correctly with days.
Also added documentation of which arguments are ms and which arguments
are days
bug=2066228
rc/com/android/providers/calendar/CalendarProvider.java
|
| 1d5e7db9bea5024ae28c18b259686c80ba3d09a0 |
18-Aug-2009 |
Ken Shirriff <kens@google.com> |
am 34e41686: Add new columns to calendar database.
Merge commit '34e416864a59b6205e33bfef4644a510d8b9abe2'
* commit '34e416864a59b6205e33bfef4644a510d8b9abe2':
Add new columns to calendar database.
|
| 34e416864a59b6205e33bfef4644a510d8b9abe2 |
18-Aug-2009 |
Ken Shirriff <kens@google.com> |
Add new columns to calendar database.
The columns are guestsCanModify, guestsCanInviteGuests,
guestsCanSeeGuests, organizer. The first three come from the database
feed, and the second is derived from the feed URL.
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 7bc37bb92eaf1ff3dfc0c54e640b585d4c372514 |
18-Aug-2009 |
Fred Quintana <fredq@google.com> |
am 2d873adc: make syncadapter set whether the account is syncable
Merge commit '2d873adcbf7fa6525cae8b566ea6000cda4ea413'
* commit '2d873adcbf7fa6525cae8b566ea6000cda4ea413':
make syncadapter set whether the account is syncable
|
| 2d873adcbf7fa6525cae8b566ea6000cda4ea413 |
17-Aug-2009 |
Fred Quintana <fredq@google.com> |
make syncadapter set whether the account is syncable
ndroidManifest.xml
rc/com/android/providers/calendar/CalendarSyncAdapter.java
ests/src/com/android/providers/calendar/TestCalendarSyncAdapter.java
|
| 553a09ef214d269dc2b6452beaa13888343a8847 |
18-Aug-2009 |
Brett Chabot <brettchabot@android.com> |
am a3f63cdb: Merge commit \'94ba87c9\' into manualmerge
Merge commit 'a3f63cdbeee8011d631ead187085d73aee54b271'
* commit 'a3f63cdbeee8011d631ead187085d73aee54b271':
Close cursors in SyncCalendarTest.
|
| a3f63cdbeee8011d631ead187085d73aee54b271 |
18-Aug-2009 |
Brett Chabot <brettchabot@android.com> |
Merge commit '94ba87c9' into manualmerge
|
| 1ea4a70c775f70214111ab5a73e9e468156794b7 |
17-Aug-2009 |
Fred Quintana <fredq@google.com> |
am 1db8ada1: (-s ours) do not merge: cherrypicked 1de41c66e767c009663496c899c62caf0e6c5ad7 and 63ccd6a02c219452ea6a16d899e56b4bf500f044 from master branch
Merge commit '1db8ada1abdc990b8d88aa17155bb8347228887a'
* commit '1db8ada1abdc990b8d88aa17155bb8347228887a':
do not merge: cherrypicked 1de41c66e767c009663496c899c62caf0e6c5ad7 and 63ccd6a02c219452ea6a16d899e56b4bf500f044 from master branch
|
| 1db8ada1abdc990b8d88aa17155bb8347228887a |
16-Aug-2009 |
Fred Quintana <fredq@google.com> |
do not merge: cherrypicked 1de41c66e767c009663496c899c62caf0e6c5ad7 and 63ccd6a02c219452ea6a16d899e56b4bf500f044 from master branch
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 63ccd6a02c219452ea6a16d899e56b4bf500f044 |
15-Aug-2009 |
Fred Quintana <fredq@google.com> |
cleanup the AccountManager API
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 94ba87c99b68e4c1bb86aeeb7d8ebea65ef88a90 |
14-Aug-2009 |
Brett Chabot <brettchabot@google.com> |
Close cursors in SyncCalendarTest.
BUG 2040084
ests/src/com/android/providers/calendar/SyncCalendarTest.java
|
| 1de41c66e767c009663496c899c62caf0e6c5ad7 |
13-Aug-2009 |
Fred Quintana <fredq@google.com> |
add legacy accounts support
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 75542165b96bfc13b044e06f2f9a838c407915eb |
13-Aug-2009 |
Debajit Ghosh <debajit@google.com> |
Revving the calendar gdata ua version, so we can differentiate cupcake and eclair requests in the proxy.
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 2c4b82d2a294c1612299641c163279a9062d4f09 |
10-Aug-2009 |
Ken Shirriff <kens@google.com> |
Implement sliding window sync.
For calendar sync, events are only synced up to the end of the window.
Daily the window is advanced, and new events in the gap are synced.
Currently sliding window is disabled unless gservices property
google_calendar_sync_window_day is set.
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| bb00086ca3714705ffd6ae43c4435906a6dd4688 |
08-Aug-2009 |
Ken Shirriff <kens@google.com> |
Revert "Implement sliding window sync."
This reverts commit 860f62af2c6c6d14bf6c2038b9a2896a83c1d37d.
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| f88fe24a7e976cf247a736f7b26681134c4108ca |
08-Aug-2009 |
Ken Shirriff <kens@google.com> |
Add calendar guest notifications.
Set gCal:sendEventNotifications in the gdata feed to cause notifications
to be sent to guests.
BUG=2025098
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 860f62af2c6c6d14bf6c2038b9a2896a83c1d37d |
13-Jun-2009 |
Ken Shirriff <kens@google.com> |
Implement sliding window sync.
For calendar sync, events are only synced up to the end of the window. Occasionally
the window is advanced, and new events in the gap are synced.
Currently sliding window is disabled unless sync.slidingwindows system property
is set to true.
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 1872feed02074780931f6538ccb43c405ce83706 |
07-Aug-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 20360
* changes:
Enhance AbstractGDataSyncAdapter methods for sliding sync.
|
| 528c9df78825d8dbf77c8e538d9afe899bd5fb97 |
07-Aug-2009 |
Ken Shirriff <kens@google.com> |
Enhance AbstractGDataSyncAdapter methods for sliding sync.
Add the feedSyncData to updateQueryParameters and updateProvider for the use of
sliding sync code.
This change needs to be submitted in conjunction with the vendor/google/frameworks change.
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| bdb4dcb71f6497e1abe368f4ce8b99a63967e74f |
07-Aug-2009 |
Jeff Sharkey <jsharkey@android.com> |
am bfdcca8d: Adopt new AppWidget assets, per http://b/2038594.
Merge commit 'bfdcca8da8886a66bc1d0439dda86fa3c936a263'
* commit 'bfdcca8da8886a66bc1d0439dda86fa3c936a263':
Adopt new AppWidget assets, per http://b/2038594.
|
| bfdcca8da8886a66bc1d0439dda86fa3c936a263 |
07-Aug-2009 |
Jeff Sharkey <jsharkey@android.com> |
Adopt new AppWidget assets, per http://b/2038594.
es/drawable-land/appwidget_bg.9.png
es/drawable/appwidget_bg.9.png
es/layout/agenda_appwidget.xml
es/values-land/dimens.xml
es/values/dimens.xml
|
| 0c16d2e013277ee0d3330f131433be9acad57338 |
07-Aug-2009 |
Michael Chan <mchan@android.com> |
Changed CalendarProvider to allow arbitrary deletion of the attendees table i.e. allow the use of where clause
rc/com/android/providers/calendar/CalendarProvider.java
|
| a06422c0e6ecd06023c80ce3b92cdb338141fdb0 |
07-Aug-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 20332
* changes:
Add tests for Attendees
|
| aca84181c9772aa6b723bb00a6ff512b928131ed |
04-Aug-2009 |
Ken Shirriff <kens@google.com> |
Add tests for Attendees
ests/src/com/android/providers/calendar/CalendarProviderTest.java
|
| 1928c8b7ee1317c56b45b129c4db2df4e94843ba |
06-Aug-2009 |
Ken Shirriff <kens@google.com> |
Fix bad URIs. Also use URI constants in several places
The URIs should be calendar/... not calendars/... to match
the constants in Calendar.java
rc/com/android/providers/calendar/CalendarProvider.java
|
| 50172248ffabb4eb45a444f4428c1a4388176937 |
06-Aug-2009 |
Ken Shirriff <kens@google.com> |
Calendar attendees: Add HAS_ATTENDEE_DATA
The HAS_ATTENDEE_DATA boolean will be set if the server has provided attendee data,
i.e. if the sync URL is /full/ and not /full-selfattendance/
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 698f00cfe74fbda100bd0e4b143c61dd21d5061d |
04-Aug-2009 |
Ken Shirriff <kens@google.com> |
Attendee database changes for calendar.
Fetch attendees from server when upgrading database to new version.
Add ownerAccount and hasAttendeeData fields to database.
Move calendarEmailAddressFromFeedUrl from CalendarProvider to CalendarSyncAdapter.
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 70687d36e77994cba08ad20238afa8104f4344aa |
05-Aug-2009 |
Ken Shirriff <kens@google.com> |
Revert "Attendee database changes for calendar."
This reverts commit 97173e6dc7b109a38d16e8cf7c8831304a7bdc92.
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| faaccd62d9b6af64a83139234a965592c71224f8 |
05-Aug-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 9686
* changes:
Attendee database changes for calendar.
|
| 97173e6dc7b109a38d16e8cf7c8831304a7bdc92 |
04-Aug-2009 |
Ken Shirriff <kens@google.com> |
Attendee database changes for calendar.
Fetch attendees from server when upgrading database to new version.
Add ownerAccount and hasAttendeeData fields to database.
Move calendarEmailAddressFromFeedUrl from CalendarProvider to CalendarSyncAdapter.
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 4760edab6023109cd8581270f30a484f5110e758 |
04-Aug-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from open-source master
|
| 44f5932c728ef29b401367a1b65ce0d8f7bec42c |
04-Aug-2009 |
Eric Fischer <enf@google.com> |
am 0ef034a4: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '0ef034a41d53f98e2bd4fba301f42bf12d647945'
* commit '0ef034a41d53f98e2bd4fba301f42bf12d647945':
Import revised translations. DO NOT MERGE
|
| 0ef034a41d53f98e2bd4fba301f42bf12d647945 |
04-Aug-2009 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
| 070078c4d9376481e120b6ec0bdeb584552eeaa4 |
29-Jul-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from donut
|
| 32508f96af7162d67e67b46e56a798f86ef1b6c9 |
29-Jul-2009 |
Ken Shirriff <kens@google.com> |
Enable multiple attendees in calendar.
rc/com/android/providers/calendar/CalendarProvider.java
|
| 2c8c25e703c71573f696a16d84e6c2d5664ff18e |
29-Jul-2009 |
Ken Shirriff <kens@google.com> |
Allow attendee changes.
The provider formerly blocked attendee changes except from sync
(through the temp provider). We are now supporting attendee
changes on the phone.
rc/com/android/providers/calendar/CalendarProvider.java
|
| 356a1307748df2f4d7e53bd160d5972581bd9f0c |
29-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 8843
* changes:
Calendar attendees: change feed
|
| 52d1a2fce81e6f104b02130deb34663b2d1c8af5 |
28-Jul-2009 |
Ken Shirriff <kens@google.com> |
Calendar attendees: change feed
Use the full feed rather than full-selfattendance in order to get
the full list of attendees.
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| a2103d0e0ca60e921cb6c7ae1c2c51522c008a12 |
26-Jul-2009 |
Jean-Baptiste Queru <jbq@google.com> |
reconcile korg/master into goog/master
|
| 2ae23e18ef788dbf356fa098d83a59519f592761 |
26-Jul-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge korg/donut into korg/master
|
| a02c60c9092e98546c1372b76167aceff2b72b88 |
23-Jul-2009 |
Fred Quintana <fredq@google.com> |
update the permissions for the AccountManagerService
ndroidManifest.xml
|
| 41f9de3652292f89a102e684a7313af862f3365b |
17-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 5eab8c54: Merge change 7630 into donut
Merge commit '5eab8c543cfdfae0a1f18742e4e026bdaa948eaa'
* commit '5eab8c543cfdfae0a1f18742e4e026bdaa948eaa':
b/1915565 Fixed ANR when snoozing or dismissing calendar notifications
|
| 5eab8c543cfdfae0a1f18742e4e026bdaa948eaa |
17-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 7630 into donut
* changes:
b/1915565 Fixed ANR when snoozing or dismissing calendar notifications
|
| 345f3dcaa75b5b0271afce8185f488b515b3f20f |
17-Jul-2009 |
Michael Chan <mchan@android.com> |
b/1915565 Fixed ANR when snoozing or dismissing calendar notifications
DB calls are all moved from the UI thread to a background thread.
rc/com/android/providers/calendar/CalendarProvider.java
|
| 0e0c5700ba7a169ae2c6741ca3fc4c0102ca9dfa |
16-Jul-2009 |
Michael Chan <mchan@android.com> |
Added localization for the default calendar name: Default
es/values/strings.xml
rc/com/android/providers/calendar/CalendarProvider.java
|
| 54741d97aac8c54c754c534c5e27eb07fa910d47 |
16-Jul-2009 |
Michael Chan <mchan@android.com> |
am 1d3f6700: b/1972231 Fixed the problem where the calendar was not showing the next event when launched from widget
Merge commit '1d3f6700d351506a828ff83dbdee6b4110d4ca68'
* commit '1d3f6700d351506a828ff83dbdee6b4110d4ca68':
b/1972231 Fixed the problem where the calendar was not showing the next event when launched from widget
|
| 1d3f6700d351506a828ff83dbdee6b4110d4ca68 |
15-Jul-2009 |
Michael Chan <mchan@android.com> |
b/1972231 Fixed the problem where the calendar was not showing the next event when launched from widget
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| 47889d0279f63f4b728d2cdfb50b93167af44823 |
15-Jul-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge commit 'goog/readonly-korg-master' into merge_korg_master
|
| f2674c13f659cad82a0aad802de3e360b1193761 |
14-Jul-2009 |
Eric Fischer <enf@google.com> |
am e2263a23: Import new translations
Merge commit 'e2263a23f24894d137ccd2ca46a5e545f69d46ac'
* commit 'e2263a23f24894d137ccd2ca46a5e545f69d46ac':
Import new translations
|
| e2263a23f24894d137ccd2ca46a5e545f69d46ac |
14-Jul-2009 |
Eric Fischer <enf@google.com> |
Import new translations
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
| 351aac9bbe5f291109d101da1d9e8d055851f034 |
10-Jul-2009 |
Ken Shirriff <kens@google.com> |
Add test for date parsing / printing beyond 2038
ests/src/com/android/providers/calendar/CalendarProviderTest.java
|
| d5c41a495bb4cfbe95112e40d27d251445b32f6d |
01-Jul-2009 |
Michael Chan <mchan@android.com> |
Added support for querying calendar event instances by day in additional to by time-millis.
rc/com/android/providers/calendar/CalendarProvider.java
|
| 171aae25d2d6a9a9ad171f981a34629307c2d17e |
07-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 5978
* changes:
Add Entity support for CalendarProvider
|
| 26f271e1a70599a710470624b2f6d0b934b97a17 |
29-Jun-2009 |
Ken Shirriff <kens@google.com> |
Add Entity support for CalendarProvider
This adds entityQuery to Calendar. This will be used by the
new sync framework.
bug=1943877
rc/com/android/providers/calendar/CalendarProvider.java
ests/src/com/android/providers/calendar/CalendarProviderTest.java
|
| c49baf52e9983d5dc05e69959006b7de455c10e1 |
03-Jul-2009 |
The Android Open Source Project <initial-contribution@android.com> |
fix the build
ndroidManifest.xml
ests/AndroidManifest.xml
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
ests/src/com/android/providers/calendar/SyncCalendarTest.java
|
| 1617d3aa869f82c2efdd8a7d999dfec892244b58 |
03-Jul-2009 |
Swarna Kumar <skumar@google.com> |
am b55344dd: Added Calendar Sync tests support for sync suite
Merge commit 'b55344ddfebfccbdb07ed7a209e91819a5e9925d'
* commit 'b55344ddfebfccbdb07ed7a209e91819a5e9925d':
Added Calendar Sync tests support for sync suite
|
| b55344ddfebfccbdb07ed7a209e91819a5e9925d |
11-Jun-2009 |
Swarna Kumar <skumar@google.com> |
Added Calendar Sync tests support for sync suite
ndroidManifest.xml
ests/AndroidManifest.xml
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
ests/src/com/android/providers/calendar/SyncCalendarTest.java
|
| 7adda6577abfee912ee70134fc965c75a5c63109 |
23-Jun-2009 |
Fred Quintana <fredq@google.com> |
support for changes to the sync settings and control API
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
ests/src/com/android/providers/calendar/TestCalendarSyncAdapter.java
|
| 46cb0859f11a244e7136f1b92554148cf74fc732 |
12-Jun-2009 |
Ken Shirriff <kens@google.com> |
Add calendar info debug screen.
Dialing *#*#CAL#*#* will bring up a list of all the calendars,
the number of events in each, and the number of unsynced events
in each.
ndroidManifest.xml
es/values/strings.xml
rc/com/android/providers/calendar/CalendarDebug.java
rc/com/android/providers/calendar/CalendarDebugReceiver.java
|
| b26dcfb2a76e25198e55f06d88e08e4db60f930c |
17-Jun-2009 |
Eric Fischer <enf@google.com> |
am 9449b8be: Make name of Calendar Provider localizable.
Merge commit '9449b8be778a2f53361adc81ac38141096c8857c'
* commit '9449b8be778a2f53361adc81ac38141096c8857c':
Make name of Calendar Provider localizable.
|
| 9449b8be778a2f53361adc81ac38141096c8857c |
17-Jun-2009 |
Eric Fischer <enf@google.com> |
Make name of Calendar Provider localizable.
ndroidManifest.xml
es/values/strings.xml
|
| 9972624a725e6134acdc98263d2bf251877774fe |
13-Jun-2009 |
Ken Shirriff <kens@google.com> |
Move meta feed handling to CalendarSyncAdapter
The meta feed code is moved from CalendarProvider to CalendarSyncAdapter.
The feed is now updated by a sync, rather than a magic query.
bug=1886271
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| cb7a72addde4313a4fd399bafa2658add3f7e12e |
11-Jun-2009 |
Eric Fischer <nobody@android.com> |
am 127cdc7b: am 6c1de36d: AI 149721: Import Portuguese translations.
Merge commit '127cdc7b7389365339357c96d57db075beb52e02'
* commit '127cdc7b7389365339357c96d57db075beb52e02':
AI 149721: Import Portuguese translations.
|
| 127cdc7b7389365339357c96d57db075beb52e02 |
10-Jun-2009 |
Eric Fischer <nobody@android.com> |
am 6c1de36d: AI 149721: Import Portuguese translations.
Merge commit '6c1de36d4021ed6986bdbc8cc664fa08f6bc0ee6' into donut
* commit '6c1de36d4021ed6986bdbc8cc664fa08f6bc0ee6':
AI 149721: Import Portuguese translations.
|
| 6c1de36d4021ed6986bdbc8cc664fa08f6bc0ee6 |
10-Jun-2009 |
Eric Fischer <nobody@android.com> |
AI 149721: Import Portuguese translations.
Automated import of CL 149721
es/values-pt/strings.xml
|
| 8c3cd9238beaa3f0463ece54a6e4c22531d4f4ad |
09-Jun-2009 |
Swarna Kumar <skumar@google.com> |
am 7755ef64: Revert "Port SyncCalendar Tests from the 1.0 release tree to Donut Client."
Merge commit '7755ef641c3da0b089c414c1166386afea4a004b'
* commit '7755ef641c3da0b089c414c1166386afea4a004b':
Revert "Port SyncCalendar Tests from the 1.0 release tree to Donut Client."
|
| 7755ef641c3da0b089c414c1166386afea4a004b |
09-Jun-2009 |
Swarna Kumar <skumar@google.com> |
Revert "Port SyncCalendar Tests from the 1.0 release tree to Donut Client."
This reverts commit 090d33dc85fe791ff0a9876b19770428cd678e03.
ndroid.mk
ndroidManifest.xml
ests/AndroidManifest.xml
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
ests/src/com/android/providers/calendar/SyncCalendarTest.java
|
| b29d3e965781e7274493907bfce5cdf5bd0e503c |
09-Jun-2009 |
Swarna Kumar <skumar@google.com> |
am 090d33dc: Port SyncCalendar Tests from the 1.0 release tree to Donut Client.
Merge commit '090d33dc85fe791ff0a9876b19770428cd678e03'
* commit '090d33dc85fe791ff0a9876b19770428cd678e03':
Port SyncCalendar Tests from the 1.0 release tree to Donut Client.
|
| 090d33dc85fe791ff0a9876b19770428cd678e03 |
04-Jun-2009 |
Swarna Kumar <skumar@google.com> |
Port SyncCalendar Tests from the 1.0 release tree to Donut Client.
ndroid.mk
ndroidManifest.xml
ests/AndroidManifest.xml
ests/src/com/android/providers/calendar/CalendarSyncTestingBase.java
ests/src/com/android/providers/calendar/SyncCalendarTest.java
|
| 46fe9cfe702e4decd0589ef76516cfaeccf03d48 |
19-May-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am b250d293: Merge change 1722 into donut
Merge commit 'b250d29335bae367be26a6f00a04f9e04ff0d135'
* commit 'b250d29335bae367be26a6f00a04f9e04ff0d135':
Handle null timezone.
|
| b250d29335bae367be26a6f00a04f9e04ff0d135 |
18-May-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 1722 into donut
* changes:
Handle null timezone.
|
| 2cc5ff176e83304114ad87d516ce3cf44cbc43e8 |
15-May-2009 |
Ken Shirriff <kens@google.com> |
am b42d4014: Fixed bug 1850510: missing recurrence exception event
Merge commit 'b42d40142b446c40b8917fcc54812f17639b20de'
* commit 'b42d40142b446c40b8917fcc54812f17639b20de':
Fixed bug 1850510: missing recurrence exception event
|
| a50a5e80e5f2acb58959c620d82ab4ab3b4fa167 |
15-May-2009 |
Ken Shirriff <kens@google.com> |
Handle null timezone.
If an event has null timezone, set the timezone to the device's timezone.
bug=1604419
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| b42d40142b446c40b8917fcc54812f17639b20de |
14-May-2009 |
Ken Shirriff <kens@google.com> |
Fixed bug 1850510: missing recurrence exception event
The old code skipped an exception if the original recurrence instance
wasn't present. The benefit of this is that exceptions will disappear
as soon as a recurrence is deleted or truncated. (After talking to the
server, the exception will be tombstoned, so this is an optimization.)
The problem with the old code is if the original recurrence instance is
outside the expansion window, it will not be present in the list, so the
exception will be erroneously dropped.
This fix just removes the code to drop exceptions when the original instance
is not present. If the old behavior is desirable, the code will need to
expand the original recurrence around the original instance time (not the
current window) to see if it is present.
This change also adds a couple additional regression tests. It also changes
an existing test to add the server-side cancel message (since otherwise the
test won't pass after this change). Some additional logging is added to
the unittest when the test fails.
rc/com/android/providers/calendar/CalendarProvider.java
ests/src/com/android/providers/calendar/CalendarProviderTest.java
|
| 24a0b5f0b2a5f5b2d09098cab996f2e362127ec5 |
04-May-2009 |
Ken Shirriff <kens@google.com> |
am 1016808: Add incremental instance expansion.
Merge commit '1016808b6ab82f62f61c464e5566598eb32c30d1'
* commit '1016808b6ab82f62f61c464e5566598eb32c30d1':
Add incremental instance expansion.
|
| 1016808b6ab82f62f61c464e5566598eb32c30d1 |
01-May-2009 |
Ken Shirriff <kens@google.com> |
Add incremental instance expansion.
The idea is for modifications to a recurrence or recurrence exception, instead
of discarding the entire instance table, only the instances related to that
recurrence are deleted, and then the instances related to that recurrence
are re-created.
bug=1655299
rc/com/android/providers/calendar/CalendarProvider.java
ests/src/com/android/providers/calendar/CalendarProviderTest.java
|
| bad84b293c08903c63be69bbc30355cb1e6af495 |
30-Apr-2009 |
Fred Quintana <fredq@google.com> |
decouple SyncAdapter from ContentProvider
ndroidManifest.xml
es/xml/syncadapter.xml
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapterService.java
|
| 467c3fd8ca37c6b518ef477f976038be9b5b45a6 |
30-Apr-2009 |
Ken Shirriff <kens@google.com> |
am a8b23f2: Refactor expandInstanceRangeLocked
Merge commit 'a8b23f2b386e3e0be20ef06522292314de8cbc78'
* commit 'a8b23f2b386e3e0be20ef06522292314de8cbc78':
Refactor expandInstanceRangeLocked
|
| a8b23f2b386e3e0be20ef06522292314de8cbc78 |
30-Apr-2009 |
Ken Shirriff <kens@google.com> |
Refactor expandInstanceRangeLocked
Split into getEvents to perform database lookup and
performInstanceExpansion to do the actual instance expansion. Remove some
dead code. Clean up try/catch so an error will just affect the specific
bad event.
rc/com/android/providers/calendar/CalendarProvider.java
|
| 7267f8da4c5300723cfc4746eccc551551e2c363 |
29-Apr-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am f2132e5: Merge change 366 into donut
Merge commit 'f2132e50346563e2051a10fe4b98b42bc0315e86'
* commit 'f2132e50346563e2051a10fe4b98b42bc0315e86':
Filter bad calendar events.
|
| db69ab4c7581053857ad78bb4acbefeadea2588b |
24-Apr-2009 |
The Android Open Source Project <initial-contribution@android.com> |
Merge commit 'korg/donut'
|
| 17726c77f5b8c53d82cafc21844f24e0b1893d0d |
23-Apr-2009 |
Fred Quintana <fredq@google.com> |
change the sync framework and users to understand Account
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
ests/src/com/android/providers/calendar/TestCalendarSyncAdapter.java
|
| f2132e50346563e2051a10fe4b98b42bc0315e86 |
23-Apr-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 366 into donut
* changes:
Filter bad calendar events.
|
| 109d3357764048d275d0493b01f2009ef9e82857 |
23-Apr-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge donut into master
|
| 40a8417a88cedcab495fa46779c2b0a6f3997d53 |
23-Apr-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge cupcake into donut
|
| 91bb0d86e0d335a48e19aabaec0a2da4dd74ec5a |
23-Apr-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge donut into master
|
| 0dd176ed633b197ef68c0c0206d067930091e832 |
21-Apr-2009 |
Ken Shirriff <kens@google.com> |
Filter bad calendar events.
Events expanded beyond 2038 were causing eventStatus crashes.
Events past 2038 were getting inserted into the database with a dtstart of -1
and lastDate of NULL. This caused the SQL query in expandInstanceRangeLocked
to pick up the event. Then, because dtendMillis was < end, the code assumed
it must be a recurrence exception and canceled it. The later code that
removes recurrence exceptions ignored the event because it wasn't a recurrence
exception, leaving the cancel in the ContentValues, causing a database error.
Thus, multiple errors had to exist to cause this bug.
The bug is no longer active, since some of the steps in the chain of events
have already been fixed. This change fixes the step that assumes the
event is a recurrence exception, which will make the code more robust.
Bug: 1705312
rc/com/android/providers/calendar/CalendarProvider.java
|
| 0d3310586b605b18e2fa098f2f6520b183c1d16c |
20-Apr-2009 |
Ken Shirriff <kens@google.com> |
Document instance invariants
Add comments to document invariants in expandInstanceRangeLocked
rc/com/android/providers/calendar/CalendarProvider.java
|
| d66a5e3494014c7529f06628e2d7e556fec3de32 |
21-Apr-2009 |
Fred Quintana <fredq@google.com> |
adding concept of features to accounts
rc/com/android/providers/calendar/CalendarProvider.java
|
| 54713084b15c80a2d2612f8f2bbc1fec6a838730 |
15-Apr-2009 |
Eric Fischer <> |
AI 146365: Import revised translations.
DO NOT MERGE
Automated import of CL 146365
es/values-nb/strings.xml
|
| 19c8faabbd22100f1dffb2bfd1fda49076c5e0da |
15-Apr-2009 |
The Android Open Source Project <initial-contribution@android.com> |
Merge commit 'korg/cupcake'
|
| c97817cd150b786c7d18c484758802080b07f9ca |
07-Apr-2009 |
Jeff Sharkey <jsharkey@android.com> |
Make Calendar widget treat multi-day events the same as allDay.
Events that start mid-day and span multiple days are not assigned the allDay flag, and were being treated as normal events. This caused us to show the same event on the calendar widget for several days, until half-way through the multi-day event.
This change treats any events with duration longer than a single day as allDay events, which triggers a widget change at the event start instead of half-way through the event.
http://b/issue?id=1772674
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| ef1b697c260639010bcc086b613c4ce708024178 |
09-Apr-2009 |
Fred Quintana <> |
Merge branch 'readonly-p4-master'
|
| 1d468494e94945da5259655965a660bb5e6ead88 |
09-Apr-2009 |
Fred Quintana <> |
AI 145177: phase two of the AccountManager
- added an AccountManagerActivity, a base Activity that can be
used by activities that are launched by AccountAuthenticator
intents. This makes it easy for an Activity to send a result
using an AccountAuthenticatorResponse
- added debug strings to the AccountAuthenticatorCache
- improved the API for the AccountAuthenticatorResponse and
made it Parcelable so that it can be passed to an Activity
via an Intent
- changed the AccountManager to use Futures for the
asynchronous calls and to notify the user via a callback
when the request is complete
- changed the AccountManager to convert any errors that are
returned into Exceptions
- added constants for the error codes that are passed across
the IAccountManagerResponse and
IAccountAuthenticatorResponse interfaces
- added a dump() method to the AccountManagerService so that
it can display the list of active sessions and registered
authenticators
- added an way to interrogate the AccountManagerService for
the list of registered authenticators
- removed more methods from the GoogleLoginServiceHelper and
GoogleLoginServiceBlockingHelper and changed the callers to
use the AccountManager
Automated import of CL 145177
rc/com/android/providers/calendar/CalendarProvider.java
|
| 7dd340313be99e5cd64cfc05ac423b4219b4ee9c |
08-Apr-2009 |
Eric Fischer <> |
AI 144977: Import revised translations.
DO NOT MERGE
Automated import of CL 144977
es/values-nl/strings.xml
|
| 6323891ec050afc1883a01127eab82730e3c782c |
02-Apr-2009 |
Jeffrey Sharkey <> |
Merge branch 'readonly-p4-master'
|
| 170c196a4093b7448f002ad785b1baabaefcb493 |
02-Apr-2009 |
Jeffrey Sharkey <> |
AI 144202: am: CL 144137 am: CL 144136 Make calendar widget correctly launch Calendar app instead of creating a second task stack.
Fixes the following issues:
- Calendar widget and calendar icon always launch to a specific calendar view--the view last selected by user.
- Launching from both widget and app icon clears any existing activity stacks.
- We correctly keeps the stack history when switching between activities using long-press-home-hardkey
Original author: jsharkey
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 144202
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| 17319b13ce8ffde4a2f2ddb15180fbda3eb55e77 |
02-Apr-2009 |
Jeffrey Sharkey <> |
Merge branch 'readonly-p4-master'
|
| 8b0cc096a1842d8926aaf4dbfbfb2fab32fbf38f |
02-Apr-2009 |
Jeffrey Sharkey <> |
AI 144100: am: CL 144068 am: CL 144067 Make Calendar widget launch into last-shown-mode to match behavior of Calendar app icon.
Original author: jsharkey
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 144100
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| 9ecfcc3659d7ecc9f60526cdc28fdd968abe6b79 |
02-Apr-2009 |
Jeffrey Sharkey <> |
AI 144137: am: CL 144136 Make calendar widget correctly launch Calendar app instead of creating a second task stack.
Fixes the following issues:
- Calendar widget and calendar icon always launch to a specific calendar view--the view last selected by user.
- Launching from both widget and app icon clears any existing activity stacks.
- We correctly keeps the stack history when switching between activities using long-press-home-hardkey
Original author: jsharkey
Merged from: //branches/cupcake/...
Automated import of CL 144137
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| 34336462ead96864c738edfe2d4aa39b35f763a6 |
02-Apr-2009 |
Jeffrey Sharkey <> |
AI 144136: Make calendar widget correctly launch Calendar app instead of creating a second task stack.
Fixes the following issues:
- Calendar widget and calendar icon always launch to a specific calendar view--the view last selected by user.
- Launching from both widget and app icon clears any existing activity stacks.
- We correctly keeps the stack history when switching between activities using long-press-home-hardkey
BUG=1752489
Automated import of CL 144136
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| aebc7114a0ec468f291c8a7ff5480a77a277822f |
01-Apr-2009 |
Jeffrey Sharkey <> |
AI 144068: am: CL 144067 Make Calendar widget launch into last-shown-mode to match behavior of Calendar app icon.
Original author: jsharkey
Merged from: //branches/cupcake/...
Automated import of CL 144068
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| 239c4ec6b66f7638a2c5d8fc9f01324ab4165495 |
01-Apr-2009 |
Jeffrey Sharkey <> |
AI 144067: Make Calendar widget launch into last-shown-mode to match behavior of Calendar app icon.
BUG=1752044
Automated import of CL 144067
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| c2f105119d809b42cada986821da2ba78e15856e |
01-Apr-2009 |
The Android Open Source Project <initial-contribution@android.com> |
Merge branch 'open_source_no_contributions' into google_internal
|
| bdaec3176078082b199e7ff8ba1fa5622726135a |
27-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
Merge commit 'korg/cupcake'
|
| 00dc6e1bfb8f1b4ba58293b26c79220967ee3304 |
26-Mar-2009 |
Jeffrey Sharkey <> |
Automated import from //branches/donutburger/...@142721,142721
es/drawable-land/appwidget_bg.9.png
es/drawable/appwidget_bg.9.png
es/drawable/white_list_rule_cal.9.png
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| 61a469794653c4337f5abcd44adff88cd52c9e4e |
26-Mar-2009 |
Jeffrey Sharkey <> |
Automated import from //branches/master/...@142762,142762
es/drawable-land/appwidget_bg.9.png
es/drawable/appwidget_bg.9.png
es/drawable/white_list_rule_cal.9.png
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| 63388f902ba845e94c8635648d0cfa42a3e07841 |
25-Mar-2009 |
Jeffrey Sharkey <> |
Automated import from //branches/cupcake/...@142649,142649
es/drawable-land/appwidget_bg.9.png
es/drawable/appwidget_bg.9.png
es/drawable/white_list_rule_cal.9.png
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| c47ce7e19a78ef7e535ffbc2f70ddb3e85a2c81d |
25-Mar-2009 |
Fred Quintana <> |
Automated import from //branches/master/...@142414,142414
rc/com/android/providers/calendar/CalendarProvider.java
|
| 5fa3bc7098d647456b54cb37b8d133225db5e92a |
25-Mar-2009 |
Jeffrey Sharkey <> |
Automated import from //branches/master/...@142124,142124
es/drawable-land/appwidget_bg.9.png
es/drawable/appwidget_bg.9.png
|
| 3d24d1200ca29c3b71d84c7baa499cae619c2700 |
25-Mar-2009 |
Jeffrey Sharkey <> |
Automated import from //branches/donutburger/...@142122,142122
es/drawable-land/appwidget_bg.9.png
es/drawable/appwidget_bg.9.png
|
| 89f319190c7b5fc85ddc980838de10b0992a2105 |
25-Mar-2009 |
Eric Fischer <> |
Automated import from //branches/master/...@141869,141869
es/values-cs/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-ru/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
| 5436f0c0f0fa6b29a1df0e24610889a44837dba6 |
25-Mar-2009 |
Eric Fischer <> |
Automated import from //branches/donutburger/...@141868,141868
es/values-cs/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-ru/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
| de1faa11dfee3d4735e6a5ffdd6b26e67e697cc1 |
25-Mar-2009 |
Ken Shirriff <> |
Automated import from //branches/master/...@141764,141764
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 8c33a8a31acea5699e504be861f5606f675d42ff |
25-Mar-2009 |
Ken Shirriff <> |
Automated import from //branches/donutburger/...@141761,141761
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| a48e5d04d39da396156925cb4a78f751c9dbf59e |
25-Mar-2009 |
Jack Veenstra <> |
Automated import from //branches/donutburger/...@141279,141279
rc/com/android/providers/calendar/CalendarProvider.java
|
| e89a281b2d8df22d88b495695e56085af54fbd04 |
25-Mar-2009 |
Jack Veenstra <> |
Automated import from //branches/master/...@141282,141282
rc/com/android/providers/calendar/CalendarProvider.java
|
| 42f855964bcd903e870e10c0dd63090a089c4e4a |
25-Mar-2009 |
Jeffrey Sharkey <> |
Automated import from //branches/donutburger/...@141103,141103
rc/com/android/providers/calendar/AppWidgetShared.java
rc/com/android/providers/calendar/CalendarAppWidgetProvider.java
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| 8f87d81901d960abd19a06c97ae4487f9fb1c0a0 |
25-Mar-2009 |
Jeffrey Sharkey <> |
Automated import from //branches/master/...@141104,141104
rc/com/android/providers/calendar/AppWidgetShared.java
rc/com/android/providers/calendar/CalendarAppWidgetProvider.java
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| 1d813a1567fff44020162e1d651c918c8deb819f |
25-Mar-2009 |
Jeffrey Sharkey <> |
Automated import from //branches/cupcake/...@142120,142120
es/drawable-land/appwidget_bg.9.png
es/drawable/appwidget_bg.9.png
|
| d494a83e74787664ad68c086b8b4025ae4d4cf20 |
25-Mar-2009 |
Jack Veenstra <> |
Automated import from //branches/master/...@140912,140912
rc/com/android/providers/calendar/CalendarProvider.java
|
| 818f28c9ba4fd9fd303931795e6d97d3322d2947 |
25-Mar-2009 |
Jack Veenstra <> |
Automated import from //branches/donutburger/...@140910,140910
rc/com/android/providers/calendar/CalendarProvider.java
|
| 9c459b0193d1eb92ade63ef887cdfe08367266e0 |
25-Mar-2009 |
Debajit Ghosh <> |
Automated import from //branches/donutburger/...@140817,140817
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 9dc22df9b910e2a40750c7f5860574995fdbb572 |
25-Mar-2009 |
Debajit Ghosh <> |
Automated import from //branches/master/...@140820,140820
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 3cb2e496edb2be0edba50e5e256c35416c6698db |
25-Mar-2009 |
Eric Fischer <> |
Automated import from //branches/cupcake/...@141866,141866
es/values-cs/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-ru/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
| ac975fcad0705e629d9349f415792ada8fc65aa5 |
25-Mar-2009 |
Ken Shirriff <> |
Automated import from //branches/cupcake/...@141760,141760
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 01e11337e4131112d59ea5aa7240ede1ba65ee2c |
20-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake_rel/...@141571
rc/com/android/providers/calendar/AppWidgetShared.java
rc/com/android/providers/calendar/CalendarAppWidgetProvider.java
rc/com/android/providers/calendar/CalendarAppWidgetService.java
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| fccf362949c516d6810314d8e51d70375c05943f |
19-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake_rel/...@140373
es/drawable-land/appwidget_bg.9.png
es/drawable/app_icon_blank.png
es/drawable/appwidget_bg.9.png
es/drawable/appwidget_date_bg.9.png
es/drawable/bg_calendar.9.png
es/drawable/bg_calendar_primary.9.png
es/drawable/strip_cal.9.png
es/drawable/strip_cal_secondary.9.png
es/layout-land/agenda_appwidget.xml
es/layout/agenda_appwidget.xml
es/values/colors.xml
es/xml/appwidget_info.xml
rc/com/android/providers/calendar/CalendarAppWidgetProvider.java
rc/com/android/providers/calendar/CalendarAppWidgetService.java
rc/com/android/providers/calendar/CalendarProvider.java
ests/src/com/android/providers/calendar/RRuleTest.java
|
| d3a63b62348be10cfea8a4de7de8d9430a3e8953 |
18-Mar-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge commit 'remotes/korg/cupcake' into merge
|
| 383907963c93e41e1cd88b760c7c5e620ccd77bc |
13-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake_rel/...@138607
ndroidManifest.xml
rc/com/android/providers/calendar/AppWidgetShared.java
rc/com/android/providers/calendar/CalendarAppWidgetProvider.java
rc/com/android/providers/calendar/CalendarAppWidgetService.java
|
| 8c72707f905724d37c9aa8965129b5dedbdcbe22 |
11-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@137873
ndroidManifest.xml
es/drawable/appwidget_date_bg.9.png
es/drawable/gadget_date_bg.9.png
es/layout-land/agenda_appwidget.xml
es/layout-land/gadget_item.xml
es/layout/agenda_appwidget.xml
es/layout/gadget_item.xml
es/values/colors.xml
es/xml/appwidget_info.xml
es/xml/gadget_info.xml
rc/com/android/providers/calendar/CalendarAppWidgetProvider.java
rc/com/android/providers/calendar/CalendarGadgetProvider.java
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/TimeChangeReceiver.java
|
| 93ac3484c10a93c016ed8158a6f09a558acd4dc8 |
09-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@137197
rc/com/android/providers/calendar/CalendarProvider.java
ests/src/com/android/providers/calendar/CalendarProviderTest.java
|
| 14b93523154ba865156107bb2f3a97b998175170 |
05-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@136594
es/drawable/gadget_date_bg.9.png
es/layout-land/gadget_item.xml
es/layout/gadget_item.xml
es/values/colors.xml
rc/com/android/providers/calendar/CalendarGadgetProvider.java
rc/com/android/providers/calendar/TimeChangeReceiver.java
|
| cf013ece751816a07396845858f1c7037ead464f |
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
ndroid.mk
ndroidManifest.xml
ODULE_LICENSE_APACHE2
OTICE
aketests.py
es/drawable/app_icon.png
es/drawable/app_icon_blank.png
es/drawable/bg_calendar.9.png
es/drawable/bg_calendar_primary.9.png
es/drawable/gadget_date_bg.9.png
es/drawable/strip_cal.9.png
es/drawable/strip_cal_secondary.9.png
es/drawable/white_list_rule_cal.9.png
es/layout-land/gadget_item.xml
es/layout/gadget_item.xml
es/values/colors.xml
es/values/strings.xml
es/xml/gadget_info.xml
rc/com/android/providers/calendar/CalendarGadgetProvider.java
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarReceiver.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
rc/com/android/providers/calendar/Duration.java
rc/com/android/providers/calendar/MetaData.java
rc/com/android/providers/calendar/RecurrenceProcessor.java
rc/com/android/providers/calendar/TimeChangeReceiver.java
rc/com/android/providers/calendar/VCal.java
ests/Android.mk
ests/AndroidManifest.xml
ests/src/com/android/providers/calendar/CalendarProviderTest.java
ests/src/com/android/providers/calendar/DurationTest.java
ests/src/com/android/providers/calendar/EventRecurrenceTest.java
ests/src/com/android/providers/calendar/ICalendarTest.java
ests/src/com/android/providers/calendar/RRuleTest.java
ests/src/com/android/providers/calendar/RecurrenceProcessorTest.java
ests/src/com/android/providers/calendar/TestCalendarSyncAdapter.java
ests/src/com/android/providers/calendar/VCalTest.java
|
| 11d37e08e1fbd651f09a3960c5a063cda55e8f4e |
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
ndroid.mk
ndroidManifest.xml
ODULE_LICENSE_APACHE2
OTICE
aketests.py
es/drawable/app_icon.png
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarReceiver.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
rc/com/android/providers/calendar/Duration.java
rc/com/android/providers/calendar/MetaData.java
rc/com/android/providers/calendar/RecurrenceProcessor.java
rc/com/android/providers/calendar/VCal.java
ests/Android.mk
ests/AndroidManifest.xml
ests/src/com/android/providers/calendar/CalendarProviderTest.java
ests/src/com/android/providers/calendar/DurationTest.java
ests/src/com/android/providers/calendar/EventRecurrenceTest.java
ests/src/com/android/providers/calendar/ICalendarTest.java
ests/src/com/android/providers/calendar/RecurrenceProcessorTest.java
ests/src/com/android/providers/calendar/TestCalendarSyncAdapter.java
ests/src/com/android/providers/calendar/VCalTest.java
|
| ca9b36fc9a01a2b8b3c1ad3c4e8fb22dc82b5869 |
03-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@132589
ndroidManifest.xml
es/drawable/app_icon_blank.png
es/drawable/bg_calendar.9.png
es/drawable/bg_calendar_primary.9.png
es/drawable/gadget_date_bg.9.png
es/drawable/strip_cal.9.png
es/drawable/strip_cal_secondary.9.png
es/drawable/white_list_rule_cal.9.png
es/layout-land/gadget_item.xml
es/layout/gadget_item.xml
es/values/colors.xml
es/values/strings.xml
es/xml/gadget_info.xml
rc/com/android/providers/calendar/CalendarGadgetProvider.java
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarReceiver.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
rc/com/android/providers/calendar/RecurrenceProcessor.java
rc/com/android/providers/calendar/TimeChangeReceiver.java
ests/src/com/android/providers/calendar/ICalendarTest.java
ests/src/com/android/providers/calendar/RRuleTest.java
|
| d99ea592f918f8e71029c1c77bc257cca30e4a64 |
03-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@137055
ndroidManifest.xml
es/drawable/app_icon_blank.png
es/drawable/bg_calendar.9.png
es/drawable/bg_calendar_primary.9.png
es/drawable/gadget_date_bg.9.png
es/drawable/strip_cal.9.png
es/drawable/strip_cal_secondary.9.png
es/drawable/white_list_rule_cal.9.png
es/layout-land/gadget_item.xml
es/layout/gadget_item.xml
es/values/colors.xml
es/values/strings.xml
es/xml/gadget_info.xml
rc/com/android/providers/calendar/CalendarGadgetProvider.java
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarReceiver.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
rc/com/android/providers/calendar/RecurrenceProcessor.java
rc/com/android/providers/calendar/TimeChangeReceiver.java
ests/src/com/android/providers/calendar/ICalendarTest.java
ests/src/com/android/providers/calendar/RRuleTest.java
|
| 21aa15bc1c446b904c7de507dfdce6fcced858cf |
19-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@132276
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/RecurrenceProcessor.java
ests/src/com/android/providers/calendar/CalendarProviderTest.java
ests/src/com/android/providers/calendar/RecurrenceProcessorTest.java
|
| e978e449ab8062e72c60d38043a60f87afac6f14 |
13-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@131421
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/Duration.java
rc/com/android/providers/calendar/RecurrenceProcessor.java
ests/src/com/android/providers/calendar/RecurrenceProcessorTest.java
|
| a01542cd5a9d1f6a328a11ae806f05eda133d60a |
11-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@130745
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/RecurrenceProcessor.java
|
| 3690a0259f2c62501a47c9a4ecd007f1c1cc599a |
16-Jan-2009 |
android-build SharedAccount <android-build@undroid16.corp.google.com> |
Merge branch 'cupcake'
|
| bac373a84429fd2a38f7de37d215749d80eb78ba |
16-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@126645
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
|
| 1a1b4a0f7987fc6f5f922f46b330448750f7cb5b |
10-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
Merge branch 'cupcake'
|
| 3cb9756c37e3e39dc488a98223ad8808f19c3c16 |
10-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@125939
rc/com/android/providers/calendar/CalendarProvider.java
|
| ae7b7b563f4a00891fac35b94109592f9137e027 |
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
ndroid.mk
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
rc/com/android/providers/calendar/RecurrenceProcessor.java
rc/com/android/providers/calendar/VCal.java
ests/Android.mk
ests/AndroidManifest.xml
ests/src/com/android/providers/calendar/CalendarProviderTest.java
ests/src/com/android/providers/calendar/DurationTest.java
ests/src/com/android/providers/calendar/EventRecurrenceTest.java
ests/src/com/android/providers/calendar/ICalendarTest.java
ests/src/com/android/providers/calendar/RecurrenceProcessorTest.java
ests/src/com/android/providers/calendar/TestCalendarSyncAdapter.java
ests/src/com/android/providers/calendar/VCalTest.java
|
| b558dececce20291e0a0195a4bd9835f4a8a1918 |
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
ndroid.mk
ndroidManifest.xml
ODULE_LICENSE_APACHE2
OTICE
aketests.py
es/drawable/app_icon.png
rc/com/android/providers/calendar/CalendarProvider.java
rc/com/android/providers/calendar/CalendarReceiver.java
rc/com/android/providers/calendar/CalendarSyncAdapter.java
rc/com/android/providers/calendar/Duration.java
rc/com/android/providers/calendar/MetaData.java
rc/com/android/providers/calendar/RecurrenceProcessor.java
rc/com/android/providers/calendar/VCal.java
|