Commit Graph

4743 Commits

Author SHA1 Message Date
Eric Fischer
a2d1b7e3f4 am 4225039a: (-s ours) am 625cf4ca: Import revised translations. DO NOT MERGE
* commit '4225039afe0890a716b2e9a1400d0ee10b0decac':
  Import revised translations.  DO NOT MERGE
2011-02-08 10:53:03 -08:00
Eric Fischer
4225039afe am 625cf4ca: Import revised translations. DO NOT MERGE
* commit '625cf4cac27b75e61e8f3e82f533d83c83a9b27d':
  Import revised translations.  DO NOT MERGE
2011-02-08 10:44:07 -08:00
Todd Kennedy
8586532f3e Fix attachment mime type unit tests
Attachments with no extension and mime type of text/plain need to return the
mime type of "text/plain" instead of "application/octet-stream"

bug 3428076

Change-Id: I00452c908ac0672879d42f4ed9ee574e376eac9f
2011-02-08 09:51:16 -08:00
Todd Kennedy
3a18f5f8c8 Fix "method not found" unit test errors
Not only were needed methods added to the proguard.flags file, but, the file
was generally cleaned up so that only the methods absolutely required by the
unit tests are specified.

Change-Id: If888d69325c3138815e39218d05eec473d5d72b6
2011-02-07 17:27:43 -08:00
Eric Fischer
625cf4cac2 Import revised translations. DO NOT MERGE
Change-Id: I2e6ded83b1111789122a0d9e9dad52df805721b7
2011-02-07 17:22:41 -08:00
Todd Kennedy
6e4df4de7a Merge "Fix mailbox adapter & message order manager unit tests" 2011-02-07 15:43:34 -08:00
Todd Kennedy
5fdd36aba6 Merge "Fix inbox query unit tests" 2011-02-07 15:42:57 -08:00
Todd Kennedy
bddc4e87ef Fix mailbox adapter & message order manager unit tests
* the new mailbox queries will only catch message that are
"loaded"; by default, messages were created "unloaded", so,
the query was returning 0 results

* extra parens were removed from the query string; the text
needed to be updated to not check for the extra parens

bug 3428077

Change-Id: Iea5867e741b9673985ca020aa3a8425c061324bf
2011-02-07 15:07:55 -08:00
Todd Kennedy
43a85091e9 Fix inbox query unit tests
The new query will only select attachments if their associated message is in
the loaded state. The unit tests need to add the messages to the loaded state.

bug 3428076

Change-Id: Ib4ad8b2570a2cdc042b932b10dbaa3170ab825cd
2011-02-07 14:57:30 -08:00
Eric Fischer
7fc19e98c6 Import revised translations. DO NOT MERGE
Change-Id: Ic8a992a03e32a62f023995a29ee671dede5aab18
2011-02-07 13:19:59 -08:00
Justin Ho
fb5bb64589 am d7e48963: am 5769309e: Updated Email launcher icon
* commit 'd7e4896339954fda3b12a3bc23979f7abdc4fbc2':
  Updated Email launcher icon
2011-02-07 11:35:01 -08:00
Andy Stadler
d4cad2dae8 Merge "Remove all compatibility with pre-2.0 data" 2011-02-07 11:12:25 -08:00
Marc Blank
433d500cb9 Merge "Show smart forward attachments in MessageCompose" 2011-02-07 10:11:36 -08:00
Andy Stadler
7d51b7a05b Remove all compatibility with pre-2.0 data
* Remove LocalStore (pre-2.0 mail database) and its unit test
* Remove UpgradeAccounts (converted pre-2.0 accounts to Provider)
* Remove FolderMessageList (receiver for pre-1.6 desktop shortcuts)
* Remove "upgrading" paths through LegacyConversions
* Clip out dangling references to everything above

Bug: 3292310
Change-Id: I5654d55a0879b00b05b63055b94651855a8ee3ef
2011-02-06 00:54:39 -08:00
Justin Ho
d7e4896339 am 5769309e: Updated Email launcher icon
* commit '5769309e1e3396b5b8100ac455330de1a2c338b6':
  Updated Email launcher icon
2011-02-03 15:41:29 -08:00
Justin Ho
5769309e1e Updated Email launcher icon
Change-Id: I6c2fcda8bd10b4673a2556e7adde0212686b7a9d
2011-02-03 14:55:00 -08:00
Todd Kennedy
5e39f90e9d Resolve build warnings; part 4
Fix unchecked warnings

Change-Id: I872740fca4e5050e6ed2922eabc7e46e5e97ff3c
2011-02-03 12:44:24 -08:00
Todd Kennedy
8d8537cd2e Resolve build warnings; part 3
Fixes deprecation warnings

NOTE: This does not resolve hostauth deprecation; that will be fixed
in a separate CL.

Change-Id: I47115516da34effbf885615cb439c9d3e6f95b84
2011-02-03 12:43:12 -08:00
Todd Kennedy
8546e21e1e Resolve build warnings; part 2
Change-Id: I76c1a5a4f759071f92eef0574abb20a99bfb32b7
2011-02-03 11:46:40 -08:00
Todd Kennedy
44de127691 Resolve build warnings; part 1
Change-Id: I80ca98ef80a427229ab5feb41568e34b257f32ce
2011-02-03 11:44:39 -08:00
Justin Ho
045f91e94f am d31aa4e2: am e653ed26: Merge "Updating Email checkboxes with framework assets" into honeycomb
* commit 'd31aa4e2a940e21964dbdbf9653709e988fe3a90':
  Updating Email checkboxes with framework assets
2011-02-02 16:21:12 -08:00
Justin Ho
d31aa4e2a9 am e653ed26: Merge "Updating Email checkboxes with framework assets" into honeycomb
* commit 'e653ed2641fd6ef1d8795a31f096abd61f3c7b63':
  Updating Email checkboxes with framework assets
2011-02-02 15:52:42 -08:00
Justin Ho
e653ed2641 Merge "Updating Email checkboxes with framework assets" into honeycomb 2011-02-02 14:41:04 -08:00
Justin Ho
10b5ace91c Updating Email checkboxes with framework assets
Change-Id: I52fb28304d7175372f05d889a388d7fb846807f1
2011-02-02 14:36:46 -08:00
Jesse Wilson
3aee641aab Use a field rather than a superclass for ContentCache's cache.
This makes it easier for cache experiments to swap out the
LinkedHashMap for another cache.

http://b/3184897
Change-Id: Iacdb266e41f5a98efd9bb30bc09ff8fff5a0a5a9
2011-02-02 12:11:17 -08:00
Jean-Baptiste Queru
1d62e10e4f am bbedac04: am 05f45f89: am 4895e726: Merge from gingerbread
* commit 'bbedac04b0acb9300bb0ab90a1d921b0d0e7dd11':
2011-02-02 09:59:35 -08:00
Jean-Baptiste Queru
bbedac04b0 am 05f45f89: am 4895e726: Merge from gingerbread
* commit '05f45f89e367a82ca9bbb07f8f90e2635c9cad16':
2011-02-02 09:56:22 -08:00
Jean-Baptiste Queru
05f45f89e3 am 4895e726: Merge from gingerbread
* commit '4895e726ee66978dc24c618917e86b2930fe9bdf':
2011-02-02 09:53:24 -08:00
Jean-Baptiste Queru
e14e903a30 am 5e1fa607: (-s ours) am 80312972: (-s ours) am feb9a2c6: Merge from open-source gingerbread - do not merge
* commit '5e1fa60708995aff67d4c1fd206670ea9ef6f1ef':
  Fix a decoding problem on the Email body
2011-02-02 08:05:46 -08:00
Jean-Baptiste Queru
5e1fa60708 am 80312972: (-s ours) am feb9a2c6: Merge from open-source gingerbread - do not merge
* commit '8031297202239c19ee43d34d467af25b90a07479':
  Fix a decoding problem on the Email body
2011-02-02 08:03:33 -08:00
Jean-Baptiste Queru
4895e726ee Merge from gingerbread
Change-Id: I874374c7c0a05f4159e1a77142d95eb62f7eac61
2011-02-02 08:02:02 -08:00
Jean-Baptiste Queru
8031297202 am feb9a2c6: Merge from open-source gingerbread - do not merge
* commit 'feb9a2c6be046cdb328223c5d76e027c07eb1326':
  Fix a decoding problem on the Email body
2011-02-02 07:58:15 -08:00
Jean-Baptiste Queru
feb9a2c6be Merge from open-source gingerbread - do not merge
Change-Id: Ic48053624dcb200a64776de01ba258800ed3a75c
2011-02-02 07:53:48 -08:00
Jean-Baptiste Queru
b4f225021d Merge "Fix a decoding problem on the Email body" into gingerbread 2011-02-02 07:53:09 -08:00
Makoto Onuki
9d8438e7e3 am 1cedfc8e: am 6c15d943: Merge "Don\'t mix up loader managers" into honeycomb
* commit '1cedfc8e5c16c6331f4689f2fb5c81117958c987':
  Don't mix up loader managers
2011-02-01 16:06:36 -08:00
Makoto Onuki
1cedfc8e5c am 6c15d943: Merge "Don\'t mix up loader managers" into honeycomb
* commit '6c15d943c2a5b4bfb4178d85acf0f415cb2fd6af':
  Don't mix up loader managers
2011-02-01 16:04:42 -08:00
Makoto Onuki
6c15d943c2 Merge "Don't mix up loader managers" into honeycomb 2011-02-01 16:03:26 -08:00
Makoto Onuki
d4df1cf65a Don't mix up loader managers
- Don't use activity's LoaderManager in fragments.  Fragments have their own
  loader managers, and using the wrong one causes loaders won't get reset()
  when the owner fragment gets destroyed().

- Don't destroy loaders by ourselves.

The combination of these two issues caused the problem where the loader
callbacks wouldn't get the reset event, which resulted in the adapter
holding a closed cursor.

Bug 3412079

Change-Id: Ib7441565ea69adb08eb74845b0996c7b8ae6f53b
2011-02-01 15:45:52 -08:00
Sang-Jun Park
499fc762ee Fix a decoding problem on the Email body
When decoding the Email body, email application used google default base64
function.  But it caused problem, so particular email did not sync any more.
So we have changed decoding function as a decoder from apache in order
not to occur problem

Change-Id: I7581123f21fbb4015153ca6f4a0c14c0f6a769fc
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
2011-02-02 08:16:13 +09:00
Marc Blank
d26c138cb2 am 4c0ae95f: am 73ba7150: Merge "Delete calendar properly on commanded wipe" into honeycomb
* commit '4c0ae95fbea959f15aef958814311f1f063134d2':
  Delete calendar properly on commanded wipe
2011-02-01 13:26:18 -08:00
Marc Blank
4c0ae95fbe am 73ba7150: Merge "Delete calendar properly on commanded wipe" into honeycomb
* commit '73ba71506a542ac6fd6463f2cf1efea1569bbcc4':
  Delete calendar properly on commanded wipe
2011-02-01 06:52:28 -08:00
Marc Blank
73ba71506a Merge "Delete calendar properly on commanded wipe" into honeycomb 2011-02-01 06:50:08 -08:00
Marc Blank
81d68b842e Delete calendar properly on commanded wipe
* CalendarProvider2 has unusual semantics for its delete operation on
  Calendars; this caused the user's calendar NOT to be deleted when
  the server commanded a wipe of calendar data.  The result was
  duplication of events after the subsequent resync

Bug: 3361000
Change-Id: I672034a7a444eb7ebdea60cd6dc66a31087cc6f7
2011-01-31 21:07:18 -08:00
Eric Fischer
9e20e61350 am 3d462540: (-s ours) am 0d676a12: Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb
* commit '3d462540c34dc5e1afe904ade91530caa73bdbc9':
  Import revised translations.  DO NOT MERGE.  Bug 3394542
2011-01-31 18:38:34 -08:00
Justin Ho
ab5498ccc3 am 96535ff3: am 6f6524ff: Merge "Changing Add Account icon to another asset Bug: 3405709 Bug: 3362749" into honeycomb
* commit '96535ff3e533226b48b88bf9914fa5cdf9de648a':
  Changing Add Account icon to another asset Bug: 3405709 Bug: 3362749
2011-01-31 18:38:29 -08:00
Eric Fischer
3d462540c3 am 0d676a12: Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb
* commit '0d676a12589c9c6a822d5b802dfc0ff711bb4280':
  Import revised translations.  DO NOT MERGE.  Bug 3394542
2011-01-31 18:33:10 -08:00
Justin Ho
96535ff3e5 am 6f6524ff: Merge "Changing Add Account icon to another asset Bug: 3405709 Bug: 3362749" into honeycomb
* commit '6f6524ff284de9f1059ee883f2cf1b06866d361e':
  Changing Add Account icon to another asset Bug: 3405709 Bug: 3362749
2011-01-31 18:31:51 -08:00
Todd Kennedy
f1b510462f Fix ConcurrentAccessException in unit tests
The ContentCache is now an LRU cache. This means we must NOT access the cache
while using any iterator over the cache. In this case, we were calling get()
using an iterator of cache keys.

Change-Id: I2d1feabff7474b6f2a230b98f97df067ab7ccd9c
2011-01-31 17:39:44 -08:00
Eric Fischer
0d676a1258 Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb 2011-01-31 17:28:00 -08:00
Justin Ho
6f6524ff28 Merge "Changing Add Account icon to another asset Bug: 3405709 Bug: 3362749" into honeycomb 2011-01-31 17:03:42 -08:00