Commit Graph

4892 Commits

Author SHA1 Message Date
Andy Stadler 5f830f8608 Fix race condition NPE caught by monkey
Bug: 4080321
Change-Id: Ia6ef0a47f87ffdc96269a95cc3bc5564d2e98440
2011-03-10 14:56:10 -08:00
Andy Stadler bdf0272425 Update Email version# for 3.1 release
Bug: 3018936
Change-Id: Id1e9ae8c714561a966ef3c44769a74e9704d0dc6
2011-03-10 14:37:51 -08:00
Todd Kennedy d43ebd7804 am 19829ef7: Merge "Fix NPE when trying to open attachments" into honeycomb-mr1
* commit '19829ef7edfe1a72a88e0ba57f3ce6c57d9ae8f6':
  Fix NPE when trying to open attachments
2011-03-10 14:27:19 -08:00
Todd Kennedy f94fdfd4b5 am d135ac61: Merge "Update attachment buttons after loading attachment" into honeycomb-mr1
* commit 'd135ac61ee22c81509c71273b2d053fc36ea210a':
  Update attachment buttons after loading attachment
2011-03-10 14:25:40 -08:00
Todd Kennedy 19829ef7ed Merge "Fix NPE when trying to open attachments" into honeycomb-mr1 2011-03-10 14:23:05 -08:00
Todd Kennedy d135ac61ee Merge "Update attachment buttons after loading attachment" into honeycomb-mr1 2011-03-10 14:20:50 -08:00
Eric Fischer c3e46ffa85 am 6973f001: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '6973f001cbe25b5ce76eee56aa6bf695f382caaf':
  Import revised translations.  DO NOT MERGE
2011-03-10 13:54:08 -08:00
Eric Fischer 6973f001cb Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-10 11:41:26 -08:00
Eric Fischer f41d724b86 Import revised translations. DO NOT MERGE
Change-Id: I583363eaa54e813f0b7192642acdc434e92c44a4
2011-03-10 11:26:49 -08:00
Todd Kennedy 074cc5869d Update attachment buttons after loading attachment
We would update the attachment buttons if the UI was becoming visible (i.e.
coming back from a settings page), but, we weren't updating them after the
attachment finished loading.

bug 4074694

Change-Id: I9d235620b5a92c2bbb871f70c9d97350cc151ce8
2011-03-10 09:06:13 -08:00
Todd Kennedy edd1c9ac7e Fix NPE when trying to open attachments
The attachment info may be null when we attempt to mark them for downloading.
Add a null-check before we try to dereference the info structure.

bug 4053184

Change-Id: I831e3abd100664c92f7af585014a03250e40ff64
2011-03-09 17:00:46 -08:00
Marc Blank 225a3ea0b6 am 70e99aa9: Merge "Fix download of non-smart-forwarded attachments" into honeycomb-mr1
* commit '70e99aa97f027f9a7dd19e28f978258025f7d9ed':
  Fix download of non-smart-forwarded attachments
2011-03-09 16:17:33 -08:00
Marc Blank 180b6bdaac am 0af709c2: Merge "Make sure services are started when Email application starts" into honeycomb-mr1
* commit '0af709c2c5f953d8f519af8672c01473d7eed2a3':
  Make sure services are started when Email application starts
2011-03-09 16:15:30 -08:00
Marc Blank 4af17a654b am e233fe31: Merge "Only allow prefetch when on a WiFi network" into honeycomb-mr1
* commit 'e233fe315b5fdc5050ea4e3428856a5370567062':
  Only allow prefetch when on a WiFi network
2011-03-09 16:13:14 -08:00
Marc Blank 70e99aa97f Merge "Fix download of non-smart-forwarded attachments" into honeycomb-mr1 2011-03-09 16:12:10 -08:00
Marc Blank 0af709c2c5 Merge "Make sure services are started when Email application starts" into honeycomb-mr1 2011-03-09 16:10:16 -08:00
Makoto Onuki 2a47caef7d am 553037ba: Merge "Fix NPE in NotificationController" into honeycomb-mr1
* commit '553037ba4ecfc72d68743eff223e16fb9511d7c1':
  Fix NPE in NotificationController
2011-03-09 16:09:00 -08:00
Marc Blank e233fe315b Merge "Only allow prefetch when on a WiFi network" into honeycomb-mr1 2011-03-09 16:08:32 -08:00
Makoto Onuki 27372998d6 am dd6e6b85: Fix bug 3509555 make notification always open right account
* commit 'dd6e6b850462fd8617a73dd40b5e7d32f0aaf5ed':
  Fix bug 3509555 make notification always open right account
2011-03-09 16:06:48 -08:00
Makoto Onuki 553037ba4e Merge "Fix NPE in NotificationController" into honeycomb-mr1 2011-03-09 16:03:17 -08:00
Makoto Onuki 43c455eb26 Fix NPE in NotificationController
This would happen when a message has no from addresses.

Bug 4027170

Change-Id: I1da091a6a55b274805ee6b3e109cbeb55a21fae1
2011-03-09 15:12:30 -08:00
Marc Blank 308ecfcc7e Fix download of non-smart-forwarded attachments
Bug: 3506114
Change-Id: Id3166402b0922eb1774ff484de249391fcc5e17c
2011-03-09 14:34:24 -08:00
Makoto Onuki dd6e6b8504 Fix bug 3509555 make notification always open right account
The problem was that:
- Each account now has own new message notification
- But PendingIntens for these all point to the same activity,
  only with different long extras (for acount IDs).
- Framework merges these intents, because extras don't count
  as a "difference"  in this case.
- So when multiple new message notifications are shown, they'll
  all share the same intent internally, so they'll all open the
  same account.

A quick workaround seems to be to set a unique URI to each intents.

Bug 3509555

Change-Id: Ib02842bb32634cfdf01ae2d684dd04dfede23832
2011-03-09 10:24:36 -08:00
Eric Fischer 125a5419d3 am 4408de22: (-s ours) Import revised translations. DO NOT MERGE
* commit '4408de227ce1438813c77125fccd1249633dcaae':
  Import revised translations.  DO NOT MERGE
2011-03-08 18:42:34 -08:00
Marc Blank 88b502c70a Make sure services are started when Email application starts
Bug: 4020337
Change-Id: I6c645800c75a4f1b80c5c3d081c4292b6db81f57
2011-03-08 16:44:08 -08:00
Eric Fischer 4408de227c Import revised translations. DO NOT MERGE
Change-Id: Ib697dbb79057ad9b692c83a8171be91d8f29d299
2011-03-08 15:41:04 -08:00
Todd Kennedy 0c149eef41 am ccc0e10b: Merge "Only delete attachments from drafts" into honeycomb-mr1
* commit 'ccc0e10bc7b62e38aa0c329e69941bcda9b338e4':
  Only delete attachments from drafts
2011-03-08 11:04:29 -08:00
Todd Kennedy ccc0e10bc7 Merge "Only delete attachments from drafts" into honeycomb-mr1 2011-03-08 10:59:23 -08:00
Makoto Onuki 7e6e7416fa am 665b1801: (-s ours) Merge "DO NOT MERGE: Make ACTION_SEND_MULTIPLE work with file: URI" into honeycomb-mr1
* commit '665b1801471c4393f1a0e85c5f1206580b902eaa':
  DO NOT MERGE: Make ACTION_SEND_MULTIPLE work with file: URI
2011-03-08 10:37:18 -08:00
Makoto Onuki 665b180147 Merge "DO NOT MERGE: Make ACTION_SEND_MULTIPLE work with file: URI" into honeycomb-mr1 2011-03-08 10:32:34 -08:00
Todd Kennedy a94804c49e Only delete attachments from drafts
We should only be deleting attachments from draft messages and not all
messages.

bug 3489176

Change-Id: Ia1bd2894f3aabc1bfbfb36e2f5c486b47d6edf4f
2011-03-08 10:32:32 -08:00
Todd Kennedy 8e09307b27 am 39121c75: Fix display of inline images
* commit '39121c758dcc919b5fde4c893d488916e26d3140':
  Fix display of inline images
2011-03-08 10:21:54 -08:00
Todd Kennedy 9106c9d245 am f42d5c62: Implement UI tweaks
* commit 'f42d5c6234bfb26f63a711fd59076964283fb7f0':
  Implement UI tweaks
2011-03-08 07:58:46 -08:00
Todd Kennedy 39121c758d Fix display of inline images
Inline images can be specified in two different ways -- explicitly with a
Content-Disposition of "inline" or implicitly with no Content-Disposition.
We correctly handled the former. For the later, we now default to an "inline"
disposition if one was not specified. This is acceptable per RFC 822 which
states:

     Content-Disposition is an optional header field. In its absence,
     the MUA may use whatever presentation method it deems suitable.

Additionally, if the disposition is not specified by the server, we need to
look at the Content-Type header for the file name.

bug 2824698

Change-Id: I146f7a67197b4e737e5f82a3d570e0f74e23fa35
2011-03-08 07:53:56 -08:00
Marc Blank 973702b30e Only allow prefetch when on a WiFi network
Bug: 3515125

Change-Id: I0814ea20b1fc73807667e7f9531c1ea065bfa803
2011-03-07 22:01:34 -08:00
Todd Kennedy f42d5c6234 Implement UI tweaks
* Correct allignment of mailbox label
* Sender info & presence alignment fixed
* Header height corrected
* Sender header updated; new asset for background & remove the "fold" asset
* New asset icon and allignment for "show pictures"
* Selected rows have updated background; new assets
* New asset for checked items
* Update divider to be 2px high
* Update selected background for wide message list

bug 3510984

Change-Id: I028ed5619ea7127b0392d9f5b7b00c575b00f3c6
2011-03-07 18:18:30 -08:00
Andy Stadler d40b344fe0 am add274a7: (-s ours) Merge "DO NOT MERGE: Harden Device.getDeviceId()" into honeycomb-mr1
* commit 'add274a704cf95b39e02cc0cda4943ffe0d9c5ee':
  DO NOT MERGE: Harden Device.getDeviceId()
2011-03-07 17:39:09 -08:00
Andy Stadler add274a704 Merge "DO NOT MERGE: Harden Device.getDeviceId()" into honeycomb-mr1 2011-03-07 17:34:32 -08:00
Andy Stadler c5b23e1e71 DO NOT MERGE: Harden Device.getDeviceId()
* If we read a null deviceName, delete the file and create a
new one.

Bug: 3506362
Backport of Ida670db2f4b75cb9c94636a0af541ae5df50addf

Change-Id: If844fe2a2f3d7096a8b18e826a3640a7d9dff830
2011-03-07 17:05:00 -08:00
Todd Kennedy 7983891c4c am 019184c8: (-s ours) Merge "DO NOT MERGE: Update assets" into honeycomb-mr1
* commit '019184c8f77ce4721d51305ebf35451892a3b76d':
  DO NOT MERGE: Update assets
2011-03-07 16:38:31 -08:00
Todd Kennedy 019184c8f7 Merge "DO NOT MERGE: Update assets" into honeycomb-mr1 2011-03-07 16:32:50 -08:00
Todd Kennedy e63337e78b DO NOT MERGE: Update assets
Also tile the widget header.

bug 3500861

Change-Id: Ic8a6a0a8a83974f7c653d9c78450bada7947773a
Backport-Id: I4288c4dd0c71843e18ee370102c2112626a90f50
2011-03-07 16:21:43 -08:00
Todd Kennedy e8f1920d0d Merge "Update assets" 2011-03-07 16:10:39 -08:00
Andy Stadler 40d28161fa am 71d4eb89: (-s ours) Merge "DO NOT MERGE: Add account flag for use by sync adapters" into honeycomb-mr1
* commit '71d4eb890cc3c6d68ee8295df136413f69d837e0':
  DO NOT MERGE: Add account flag for use by sync adapters
2011-03-07 14:59:05 -08:00
Andy Stadler 71d4eb890c Merge "DO NOT MERGE: Add account flag for use by sync adapters" into honeycomb-mr1 2011-03-07 14:52:25 -08:00
Eric Fischer 225723742f am c7855d99: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'c7855d99f95bb1f02ca5a4bf49f91ef2206edfa5':
  Import revised translations.  DO NOT MERGE
2011-03-07 13:23:55 -08:00
Eric Fischer c7855d99f9 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-07 13:04:40 -08:00
Vasu Nori 58d570ca8a am 9ab40a58: Merge "bug:3513950 a trivial change due to renaming of api in downloadmanager" into honeycomb-mr1
* commit '9ab40a58b64b8f2cc78241b0ca0b9064d172729e':
  bug:3513950 a trivial change due to renaming of api in downloadmanager
2011-03-07 12:55:46 -08:00
Eric Fischer a79e8913b8 Import revised translations. DO NOT MERGE
Change-Id: I750fe542ddc2306036173285f5297ff675a7ec15
2011-03-07 12:55:14 -08:00
Vasu Nori 9ab40a58b6 Merge "bug:3513950 a trivial change due to renaming of api in downloadmanager" into honeycomb-mr1 2011-03-07 12:47:13 -08:00