Commit Graph

4365 Commits

Author SHA1 Message Date
Marc Blank
2760374f7d am c93cf5d6: am 5150d0e8: Merge "Don\'t require sSyncLock for sync error map" into honeycomb
* commit 'c93cf5d6797d80a6ac3a461d8630385105f78df8':
  Don't require sSyncLock for sync error map
2011-01-23 17:00:24 -08:00
Marc Blank
8818e4f472 am 2d9a2186: am d6fbab1e: Merge "Prevent logging about "attachment with null contentUri"" into honeycomb
* commit '2d9a2186b883863a34378e0d62799ea1338ac2ce':
  Prevent logging about "attachment with null contentUri"
2011-01-23 17:00:21 -08:00
Dianne Hackborn
91bee2345e am f5adc395: am 2b59ecae: Remove use of old theme name.
* commit 'f5adc3955cf3d8ac6af06898cf14b8e145188c88':
  Remove use of old theme name.
2011-01-23 16:50:28 -08:00
Marc Blank
c93cf5d679 am 5150d0e8: Merge "Don\'t require sSyncLock for sync error map" into honeycomb
* commit '5150d0e818174453656069eeb4f282b6293b0abc':
  Don't require sSyncLock for sync error map
2011-01-23 15:07:11 -08:00
Marc Blank
2d9a2186b8 am d6fbab1e: Merge "Prevent logging about "attachment with null contentUri"" into honeycomb
* commit 'd6fbab1e7a51852f13c343e8a0325f81c19d98c5':
  Prevent logging about "attachment with null contentUri"
2011-01-23 15:05:14 -08:00
Marc Blank
5150d0e818 Merge "Don't require sSyncLock for sync error map" into honeycomb 2011-01-23 15:04:30 -08:00
Marc Blank
d6fbab1e7a Merge "Prevent logging about "attachment with null contentUri"" into honeycomb 2011-01-23 15:03:10 -08:00
Dianne Hackborn
f5adc3955c am 2b59ecae: Remove use of old theme name.
* commit '2b59ecaebcc8012d307080f3f345692fa94e679e':
  Remove use of old theme name.
2011-01-23 14:41:35 -08:00
Dianne Hackborn
2b59ecaebc Remove use of old theme name.
Change-Id: I0a08171b3068abeb57c973074b37aaf3c87ff001
2011-01-23 13:06:41 -08:00
Makoto Onuki
61ba91078d am 2aee3a10: am 04cf5e4b: Merge "AttachmentProvider: Always return mime-types in lowercase" into honeycomb
* commit '2aee3a10027d6208e22742e17b8343a2af41845a':
  AttachmentProvider: Always return mime-types in lowercase
2011-01-23 11:41:03 -08:00
Makoto Onuki
2aee3a1002 am 04cf5e4b: Merge "AttachmentProvider: Always return mime-types in lowercase" into honeycomb
* commit '04cf5e4bdf091f490f2e3bfb40f80bab44a05e25':
  AttachmentProvider: Always return mime-types in lowercase
2011-01-23 11:38:28 -08:00
Makoto Onuki
04cf5e4bdf Merge "AttachmentProvider: Always return mime-types in lowercase" into honeycomb 2011-01-23 11:32:28 -08:00
Marc Blank
1264651c69 Prevent logging about "attachment with null contentUri"
Bug: 3373982
Change-Id: I41b655041d5c244484435fe5bab7649d9ca569eb
2011-01-22 13:55:14 -08:00
Marc Blank
2fabab32b9 Don't require sSyncLock for sync error map
* Use ConcurrentHashMap; check that this provides enough protection
  for all uses
* This resolves known deadlock issues in ExchangeService

Bug: 3371039

Change-Id: Ie4ccbe7cdfe8c3d4ec7a0f789409126c8c09f8c4
2011-01-21 18:14:04 -08:00
Andy Stadler
929f32f3b3 am a01c5101: (-s ours) am 5211161a: (-s ours) am ecffd551: DO NOT MERGE Remove all password trim() calls
* commit 'a01c510146fae9a6288c3192baaa0fd1205fba4d':
  DO NOT MERGE Remove all password trim() calls
2011-01-21 17:44:05 -08:00
Andy Stadler
a01c510146 am 5211161a: (-s ours) am ecffd551: DO NOT MERGE Remove all password trim() calls
* commit '5211161a887c6a446a275e44eb76b4207b18122e':
  DO NOT MERGE Remove all password trim() calls
2011-01-21 17:41:21 -08:00
Todd Kennedy
43ee0cb28f am c8e5a4bc: am f92dd2bf: Don\'t display toast for background download failures
* commit 'c8e5a4bc6176f994f40d442fc55e1257bbc68961':
  Don't display toast for background download failures
2011-01-21 15:38:39 -08:00
Todd Kennedy
c8e5a4bc61 am f92dd2bf: Don\'t display toast for background download failures
* commit 'f92dd2bf3ea445db9b9a0eb9a447b5cbdb1a6e05':
  Don't display toast for background download failures
2011-01-21 15:35:38 -08:00
Todd Kennedy
f92dd2bf3e Don't display toast for background download failures
When downloading attachments in the background, do not display any errors
on the display.

NOTE: This is a partial fix for general background attachment downloading issues

bug 3373982

Change-Id: I874ed902bde293303e10308f38b992b2bb15b6aa
2011-01-21 15:17:29 -08:00
Makoto Onuki
6833fd5ab6 AttachmentProvider: Always return mime-types in lowercase
Intent-filter's mime-type matching is case-sensitive.  We should always use
lowercase letters.

Bug 3375709

Change-Id: Idd4abb41f94c816a5b9150aef5859dd75487a042
2011-01-21 14:56:01 -08:00
Makoto Onuki
cddf449af8 am ebd4121f: am d5c6717e: Merge "Compose: Make sure to unhide CC if not empty for reply-all" into honeycomb
* commit 'ebd4121f7ae7ff81997fecf6d3730a4b28e7568b':
  Compose: Make sure to unhide CC if not empty for reply-all
2011-01-21 13:54:00 -08:00
Makoto Onuki
ebd4121f7a am d5c6717e: Merge "Compose: Make sure to unhide CC if not empty for reply-all" into honeycomb
* commit 'd5c6717eeb816fac19fbab0fe900cb78ca18ae63':
  Compose: Make sure to unhide CC if not empty for reply-all
2011-01-21 13:51:57 -08:00
Makoto Onuki
d5c6717eeb Merge "Compose: Make sure to unhide CC if not empty for reply-all" into honeycomb 2011-01-21 13:50:00 -08:00
Marc Blank
cc43a53f2e am 4fad1dd6: am 0a7d214b: Merge "Delete attachment if there\'s no corresponding message" into honeycomb
* commit '4fad1dd6a300cd3f49188cad69436f15fc2825a7':
  Delete attachment if there's no corresponding message
2011-01-21 11:31:04 -08:00
Marc Blank
4fad1dd6a3 am 0a7d214b: Merge "Delete attachment if there\'s no corresponding message" into honeycomb
* commit '0a7d214b27ff9a7ef2c1aa9348c65c7959db6dcb':
  Delete attachment if there's no corresponding message
2011-01-21 11:28:54 -08:00
Marc Blank
0a7d214b27 Merge "Delete attachment if there's no corresponding message" into honeycomb 2011-01-21 11:10:09 -08:00
Makoto Onuki
b7339d471f am 71349b64: am 7093746d: Don\'t modify content URI to non-email providers
* commit '71349b64dc23d8321a0d61b79520f86e0c7dedbf':
  Don't modify content URI to non-email providers
2011-01-21 10:46:45 -08:00
Makoto Onuki
3784b28aa6 Compose: Make sure to unhide CC if not empty for reply-all
Bug 3376821

Change-Id: Ieec04881843717fea55cec8efbf35757042c8d2a
2011-01-21 10:26:07 -08:00
Marc Blank
2ac1833943 Delete attachment if there's no corresponding message
Bug: 3372440
Change-Id: I5c3653c5f27e0aa7bab52ca0d979e14bb6bafc34
2011-01-20 20:32:56 -08:00
Andy Stadler
5211161a88 am ecffd551: DO NOT MERGE Remove all password trim() calls
* commit 'ecffd551cc2a9dc6813effbfc9d21f2b3825a5b5':
  DO NOT MERGE Remove all password trim() calls
2011-01-20 17:41:37 -08:00
Makoto Onuki
b39c03e5e6 am 92039f9e: am 092ff131: Merge "Expand Reply/Forward/etc buttons for easier tap" into honeycomb
* commit '92039f9e429260a1d89b67b3c1b22e5c3501e96f':
  Expand Reply/Forward/etc buttons for easier tap
2011-01-20 17:27:29 -08:00
Marc Blank
18fd28d707 am b10f7c0a: am 554ad344: Merge "Respect email sync setting" into honeycomb
* commit 'b10f7c0ad874c2d47318175eca5f106c7eb003ff':
  Respect email sync setting
2011-01-20 17:27:26 -08:00
Marc Blank
9d46dfa37c am 4904e213: am 6c9911e3: Merge "Strip content of the "head" tag" into honeycomb
* commit '4904e213cdc8878f2e0c64e5e4f82a4b8b6e749c':
  Strip content of the "head" tag
2011-01-20 17:27:22 -08:00
Roy West
c4e9606ac4 am d6f89cdd: am 41f3170c: Merge "Remove erroneous extra space char." into honeycomb
* commit 'd6f89cdde5071ae343f2c238abb84b8bc88a8cdc':
  Remove erroneous extra space char.
2011-01-20 17:27:19 -08:00
Todd Kennedy
ac78534bbc am f48d641e: am 02ba344c: Only show messages from inbox for account & unread views
* commit 'f48d641ebb7393123e6059d208cf916f654a88db':
  Only show messages from inbox for account & unread views
2011-01-20 17:27:15 -08:00
Roy West
a54f44e861 am 1f5a5fe2: am c8f6d57c: Change "status bar" to "System bar" for HC and future.
* commit '1f5a5fe2ea2fb77e194f5d91ccf8d1ac942b011a':
  Change "status bar" to "System bar" for HC and future.
2011-01-20 17:27:09 -08:00
Makoto Onuki
71349b64dc am 7093746d: Don\'t modify content URI to non-email providers
* commit '7093746dd5017b1dacb726eb7b083922de15612e':
  Don't modify content URI to non-email providers
2011-01-20 17:14:23 -08:00
Makoto Onuki
92039f9e42 am 092ff131: Merge "Expand Reply/Forward/etc buttons for easier tap" into honeycomb
* commit '092ff131afa6b6b0724bc784086ece87b0c01006':
  Expand Reply/Forward/etc buttons for easier tap
2011-01-20 17:07:25 -08:00
Marc Blank
b10f7c0ad8 am 554ad344: Merge "Respect email sync setting" into honeycomb
* commit '554ad3447570751a2b311624a7ddfbae86253f97':
  Respect email sync setting
2011-01-20 17:06:26 -08:00
Marc Blank
4904e213cd am 6c9911e3: Merge "Strip content of the "head" tag" into honeycomb
* commit '6c9911e3fbea6b975ecbd276c879e150efc29a8a':
  Strip content of the "head" tag
2011-01-20 17:06:20 -08:00
Roy West
d6f89cdde5 am 41f3170c: Merge "Remove erroneous extra space char." into honeycomb
* commit '41f3170c67c8d58add5d72034c4d83d96f58d437':
  Remove erroneous extra space char.
2011-01-20 17:05:11 -08:00
Todd Kennedy
f48d641ebb am 02ba344c: Only show messages from inbox for account & unread views
* commit '02ba344cf2489dba81058e25e3202f2898360083':
  Only show messages from inbox for account & unread views
2011-01-20 17:05:04 -08:00
Roy West
1f5a5fe2ea am c8f6d57c: Change "status bar" to "System bar" for HC and future.
* commit 'c8f6d57ca5197b731625c3e1511863cb380ad9f5':
  Change "status bar" to "System bar" for HC and future.
2011-01-20 17:01:16 -08:00
Makoto Onuki
7093746dd5 Don't modify content URI to non-email providers
The "?limit=" param is only supported by EmailProvider, so don't add
it to other URIs.

Doing so causes a permission error when opening an EML attachment on gmail,
because we're granted the permission only to the passed URI, but not to
the URI with the "?limit=" param.

Bug 3371630

Change-Id: I88fff88a7e48e5bc958124eedec3e592978a40c7
2011-01-20 16:28:36 -08:00
Makoto Onuki
092ff131af Merge "Expand Reply/Forward/etc buttons for easier tap" into honeycomb 2011-01-20 15:33:32 -08:00
Makoto Onuki
b6acba0e7b Expand Reply/Forward/etc buttons for easier tap
Bug 3372927

Change-Id: I9a6e01c43b4c534b5e6c5c697062313d610c44e6
2011-01-20 14:42:48 -08:00
Marc Blank
554ad34475 Merge "Respect email sync setting" into honeycomb 2011-01-20 14:38:48 -08:00
Marc Blank
6c9911e3fb Merge "Strip content of the "head" tag" into honeycomb 2011-01-20 14:38:26 -08:00
Marc Blank
9dc8ba5cad Strip content of the "head" tag
Bug: 3285281
Change-Id: I1183697ad09fbf8740e3529fecfa59cf6650b2f9
2011-01-20 14:31:09 -08:00
Roy West
41f3170c67 Merge "Remove erroneous extra space char." into honeycomb 2011-01-20 13:26:59 -08:00