Commit Graph

806 Commits

Author SHA1 Message Date
Mihai Preda
f7a8a803f1 am 1b590566: Merge change 23021 into eclair
Merge commit '1b590566611017d95076ea7c4b36a5704219175a'

* commit '1b590566611017d95076ea7c4b36a5704219175a':
  Email: check for closed cursor in onPostExecute for AsyncTasks.
2009-09-01 04:35:51 -07:00
Android (Google) Code Review
1b59056661 Merge change 23021 into eclair
* changes:
  Email: check for closed cursor in onPostExecute for AsyncTasks.
2009-09-01 04:31:26 -07:00
Marc Blank
7a18ee26c2 am d39e3486: Merge change 23407 into eclair
Merge commit 'd39e34862a445e9a5ae4c4bc22098329418b5e3b'

* commit 'd39e34862a445e9a5ae4c4bc22098329418b5e3b':
  Remove the temporary call to start SyncManager in Welcome.java
2009-08-31 22:35:42 -07:00
Marc Blank
8102b7bad0 am fe75cef7: Merge change 23315 into eclair
Merge commit 'fe75cef7c71bb4d26a0a8bdd4ea8b1a85df2368b'

* commit 'fe75cef7c71bb4d26a0a8bdd4ea8b1a85df2368b':
  Fix 2085862; add email address to test Account
2009-08-31 22:33:20 -07:00
Android (Google) Code Review
d39e34862a Merge change 23407 into eclair
* changes:
  Remove the temporary call to start SyncManager in Welcome.java
2009-08-31 22:32:03 -07:00
Android (Google) Code Review
fe75cef7c7 Merge change 23315 into eclair
* changes:
  Fix 2085862; add email address to test Account
2009-08-31 22:30:05 -07:00
Marc Blank
75a0873dd9 Remove the temporary call to start SyncManager in Welcome.java
Change-Id: Ic15b19374e89d2b1329e55d4bc86336499a983fd
2009-08-31 22:06:30 -07:00
Marc Blank
bbb103a349 am 7266d90d: Make mailboxes respect the sync interval of the Account
Merge commit '7266d90daccee82cb398356defb0c30d95a2ebdd'

* commit '7266d90daccee82cb398356defb0c30d95a2ebdd':
  Make mailboxes respect the sync interval of the Account
2009-08-31 21:50:22 -07:00
Marc Blank
7266d90dac Make mailboxes respect the sync interval of the Account
* Fixes #2089954

Change-Id: I1b632462ad23da5f024efe2d13ebb11e8e600c67
2009-08-31 21:45:58 -07:00
Marc Blank
469d07fdd4 Use bulk delete for wiping contacts, now that it's implemented in ContactsProvider
Change-Id: I0363901902cc8c17116222eb78bacd2e96ad28d7
2009-08-31 21:43:54 -07:00
Marc Blank
2ebf7d97ec Fix 2085862; add email address to test Account
Change-Id: I1980935207a96daa0b34bf78931e47b8374c84cc
2009-08-31 11:50:30 -07:00
Marc Blank
b27c005f53 am b3e4c798: Change ContentObserver for Account; fix two bugs
Merge commit 'b3e4c798732356021be7c022112cada1517c4994'

* commit 'b3e4c798732356021be7c022112cada1517c4994':
  Change ContentObserver for Account; fix two bugs
2009-08-30 19:30:59 -07:00
Marc Blank
b3e4c79873 Change ContentObserver for Account; fix two bugs
* Fixes 2085862 and 2087385

Change-Id: I38e046e861ec0423669506194c0bcd6c9c96328c
2009-08-30 19:24:56 -07:00
Marc Blank
ac11161ebd am 617720eb: Handle user deletions in Exchange Contacts sync (i.e. upsync them)
Merge commit '617720eb35a1906ea2c9e49802d67dc443b89f5e'

* commit '617720eb35a1906ea2c9e49802d67dc443b89f5e':
  Handle user deletions in Exchange Contacts sync (i.e. upsync them)
2009-08-30 15:25:19 -07:00
Marc Blank
617720eb35 Handle user deletions in Exchange Contacts sync (i.e. upsync them)
Change-Id: I94a8d83b4739b6439a7a87c0bf22ed165a9c9186
2009-08-29 20:09:52 -07:00
Marc Blank
3f61b5a432 am ebda7847: Fix bugs related to Contacts sync behavior in Exchange
Merge commit 'ebda78473223242ae0be4508a46dc60d2632b8ea'

* commit 'ebda78473223242ae0be4508a46dc60d2632b8ea':
  Fix bugs related to Contacts sync behavior in Exchange
2009-08-29 13:11:38 -07:00
Marc Blank
ebda784732 Fix bugs related to Contacts sync behavior in Exchange
* Respect the UPLOAD extra from SyncManager and check for changes before starting
  a sync.
* Failure to do this was causing looping behavior

Change-Id: Idfb1c35782b6d3771f9455c6fe86489572a871c5
2009-08-29 12:55:55 -07:00
Marc Blank
2ba9b888f7 am a7927a87: Merge change 23116 into eclair
Merge commit 'a7927a874be0f8d7577dfc30920d0f73c9973f68'

* commit 'a7927a874be0f8d7577dfc30920d0f73c9973f68':
  Create BootReceiver for Exchange for proper self-management
2009-08-28 18:26:20 -07:00
Marc Blank
1944cdc42f am 00adf097: Merge change 23197 into eclair
Merge commit '00adf0971bee0ea0e228fc7a468fb54191c2c7b5'

* commit '00adf0971bee0ea0e228fc7a468fb54191c2c7b5':
  Fix some Contacts upsync bugs; add logging for serialization
2009-08-28 18:26:19 -07:00
Android (Google) Code Review
a7927a874b Merge change 23116 into eclair
* changes:
  Create BootReceiver for Exchange for proper self-management
2009-08-28 18:23:19 -07:00
Android (Google) Code Review
00adf0971b Merge change 23197 into eclair
* changes:
  Fix some Contacts upsync bugs; add logging for serialization
2009-08-28 18:22:39 -07:00
Marc Blank
58267fe146 Fix some Contacts upsync bugs; add logging for serialization
Change-Id: I855a8ee3df520f53fc94866b8463d314cf800ca5
2009-08-28 16:37:29 -07:00
Daniel Sandler
b469b5ca3c am 0740d8ef: Merge change 23140 into eclair
Merge commit '0740d8ef801bf54ccd2c71aa1d923605814c36d4'

* commit '0740d8ef801bf54ccd2c71aa1d923605814c36d4':
  High-resolution (hdpi) artwork from TAT for Email.
2009-08-28 13:20:40 -07:00
Android (Google) Code Review
0740d8ef80 Merge change 23140 into eclair
* changes:
  High-resolution (hdpi) artwork from TAT for Email.
2009-08-28 13:16:13 -07:00
Eric Fischer
20793516d0 am 5c3fedec: Merge change 23027 into eclair
Merge commit '5c3fedecbe68520afda1fbccf8bfcaf6036263b7'

* commit '5c3fedecbe68520afda1fbccf8bfcaf6036263b7':
  Armor string format tokens with translation placeholders.
2009-08-28 13:04:47 -07:00
Android (Google) Code Review
5c3fedecbe Merge change 23027 into eclair
* changes:
  Armor string format tokens with translation placeholders.
2009-08-28 13:00:52 -07:00
Daniel Sandler
bdd319ac29 High-resolution (hdpi) artwork from TAT for Email. 2009-08-28 15:02:44 -04:00
Marc Blank
53cb37c3ef Create BootReceiver for Exchange for proper self-management
Change-Id: I95e9e632de91d7f0e2505bf8879e1c164861f58c
2009-08-28 11:42:17 -07:00
Marc Blank
6d94001a82 am bd4fe2db: Merge change 23114 into eclair
Merge commit 'bd4fe2db84afc7425cff536953faa4f912997736'

* commit 'bd4fe2db84afc7425cff536953faa4f912997736':
  Fix upload of read state for Exchange emails
2009-08-28 10:43:34 -07:00
Marc Blank
118963a567 am c29ec545: Fix Contacts sync adapter required by change to SyncManager
Merge commit 'c29ec54532e17565783353014102d269087c727a'

* commit 'c29ec54532e17565783353014102d269087c727a':
  Fix Contacts sync adapter required by change to SyncManager
2009-08-28 10:43:32 -07:00
Android (Google) Code Review
bd4fe2db84 Merge change 23114 into eclair
* changes:
  Fix upload of read state for Exchange emails
2009-08-28 10:28:21 -07:00
Marc Blank
c29ec54532 Fix Contacts sync adapter required by change to SyncManager
Change-Id: Icfc1f191289170185548a03ca94d1f79f10b7519
2009-08-28 10:25:20 -07:00
Marc Blank
85a78c7495 Fix upload of read state for Exchange emails
Change-Id: Id5959f9c2394644e88b3961dea24f54ff1ad7141
2009-08-28 10:24:27 -07:00
Fred Quintana
dbe681a73f am e3a25fe5: Merge change 23009 into eclair
Merge commit 'e3a25fe58d2e6faa5a622a969e4bb8b62859ce84'

* commit 'e3a25fe58d2e6faa5a622a969e4bb8b62859ce84':
  fix a bug that can allow multiple syncs to start in parallel
2009-08-27 20:06:50 -07:00
Android (Google) Code Review
e3a25fe58d Merge change 23009 into eclair
* changes:
  fix a bug that can allow multiple syncs to start in parallel
2009-08-27 20:02:54 -07:00
Fred Quintana
63ec89f61a fix a bug that can allow multiple syncs to start in parallel 2009-08-27 18:33:49 -07:00
Eric Fischer
a7ba5fe1f2 Armor string format tokens with translation placeholders.
Change-Id: I6b78d906291f6df932b933b384c210c017b720c3
2009-08-27 17:24:38 -07:00
Mihai Preda
285efb4aff Email: check for closed cursor in onPostExecute for AsyncTasks.
BUG 2081965
2009-08-28 02:05:31 +02:00
Mihai Preda
35dee62c07 am 52129ec4: Merge change 23001 into eclair
Merge commit '52129ec4b2b4d02012f6d87ed146916995b096d2'

* commit '52129ec4b2b4d02012f6d87ed146916995b096d2':
  MessageCompose: BUG 2069196, compose email from the correct account.
2009-08-27 16:55:03 -07:00
Android (Google) Code Review
52129ec4b2 Merge change 23001 into eclair
* changes:
  MessageCompose: BUG 2069196, compose email from the correct account.
2009-08-27 16:50:14 -07:00
Mihai Preda
948e5ae63b MessageCompose: BUG 2069196, compose email from the correct account. 2009-08-28 01:29:33 +02:00
Marc Blank
6792434c39 am ab11649e: Merge change 22989 into eclair
Merge commit 'ab11649eed5cb73ce06d9fe266456e221b82796d'

* commit 'ab11649eed5cb73ce06d9fe266456e221b82796d':
  Fix usage of isDefault and IS_DEFAULT to be consistent
2009-08-27 16:27:48 -07:00
Marc Blank
d5c3d5a699 am 5525e2b3: Merge change 22996 into eclair
Merge commit '5525e2b3c169656bdd127e7a0aff7242404cbfd6'

* commit '5525e2b3c169656bdd127e7a0aff7242404cbfd6':
  Fix NPE in bug #2080357
2009-08-27 16:27:46 -07:00
Android (Google) Code Review
ab11649eed Merge change 22989 into eclair
* changes:
  Fix usage of isDefault and IS_DEFAULT to be consistent
2009-08-27 16:24:02 -07:00
Android (Google) Code Review
5525e2b3c1 Merge change 22996 into eclair
* changes:
  Fix NPE in bug #2080357
2009-08-27 16:23:52 -07:00
Marc Blank
242fde1920 Fix NPE in bug #2080357
Change-Id: I07c0b65e16568e9cf182b70302f2a1ce90d2581b
2009-08-27 15:58:44 -07:00
Marc Blank
0401ad5334 Fix usage of isDefault and IS_DEFAULT to be consistent
* There was inconsistent usage between int and boolean for this column

Change-Id: Ifa7bd6f2563920a95b6b714f3a7b14e5be29d176
2009-08-27 15:26:06 -07:00
Mihai Preda
d20791dec0 am 0967b74a: am 629e18ad: Fix base64 decoder. BUG 2081740.
Merge commit '0967b74a62720167226e903225d47f25bacc7f92'

* commit '0967b74a62720167226e903225d47f25bacc7f92':
  Fix base64 decoder. BUG 2081740.
2009-08-27 15:20:35 -07:00
Mihai Preda
0967b74a62 am 629e18ad: Fix base64 decoder. BUG 2081740.
Merge commit '629e18ad866917523599ed059898f4d986e49e26' into eclair

* commit '629e18ad866917523599ed059898f4d986e49e26':
  Fix base64 decoder. BUG 2081740.
2009-08-27 15:16:39 -07:00
Marc Blank
a7c02325e6 am f8a81b94: Set ContactsProvider Settings so that ungrouped Exchange contacts display by default
Merge commit 'f8a81b94a3de67e8dcd6a83b06079c2656f511a8'

* commit 'f8a81b94a3de67e8dcd6a83b06079c2656f511a8':
  Set ContactsProvider Settings so that ungrouped Exchange contacts display by default
2009-08-27 14:07:14 -07:00