Commit Graph

4798 Commits

Author SHA1 Message Date
Andy Stadler
4c6f8b55bb am 8252c305: (-s ours) am 07a85746: Merge "DO NOT MERGE - Prevent NPE when account sender name is null" into gingerbread
* commit '8252c305993f9a1e78307be989f3947c16c44617':
  DO NOT MERGE - Prevent NPE when account sender name is null
2011-03-30 15:30:15 -07:00
Andy Stadler
7bead5e3b8 am 3f8c081d: (-s ours) am aba60dfb: Merge "DO NOT MERGE - Fix NPE when trying to open attachments" into gingerbread
* commit '3f8c081d2b985915dd6585f4ef13d964bf8580c2':
  DO NOT MERGE - Fix NPE when trying to open attachments
2011-03-30 15:30:13 -07:00
Andy Stadler
b9e46a6860 am 4fed8653: (-s ours) am 064c1870: Merge "DO NOT MERGE - Fix NPE in pop3 checkcapabilities" into gingerbread
* commit '4fed865309b1f601e61ece38caa3fd4c622eb928':
  DO NOT MERGE - Fix NPE in pop3 checkcapabilities
2011-03-30 15:30:11 -07:00
Andy Stadler
7b62ac1845 am 07eb4bdc: (-s ours) am 8f0a79c2: DO NOT MERGE - Add 55 roadrunner email setups
* commit '07eb4bdc018888e018163da901a54dd15f65671c':
  DO NOT MERGE - Add 55 roadrunner email setups
2011-03-30 15:30:07 -07:00
Andy Stadler
8252c30599 am 07a85746: Merge "DO NOT MERGE - Prevent NPE when account sender name is null" into gingerbread
* commit '07a85746afecd4267de1fb17f3670b79e06a15f2':
  DO NOT MERGE - Prevent NPE when account sender name is null
2011-03-30 09:31:08 -07:00
Andy Stadler
3f8c081d2b am aba60dfb: Merge "DO NOT MERGE - Fix NPE when trying to open attachments" into gingerbread
* commit 'aba60dfb73f2e1c8406f64ba04f42d4d9a29dd1f':
  DO NOT MERGE - Fix NPE when trying to open attachments
2011-03-30 09:31:02 -07:00
Andy Stadler
4fed865309 am 064c1870: Merge "DO NOT MERGE - Fix NPE in pop3 checkcapabilities" into gingerbread
* commit '064c1870195a5d53346fd591072cc487083be7b6':
  DO NOT MERGE - Fix NPE in pop3 checkcapabilities
2011-03-30 09:30:59 -07:00
Andy Stadler
07eb4bdc01 am 8f0a79c2: DO NOT MERGE - Add 55 roadrunner email setups
* commit '8f0a79c2ef29b714110ee00a4fc28f97a729d4ef':
  DO NOT MERGE - Add 55 roadrunner email setups
2011-03-30 09:30:50 -07:00
Justin Ho
e5705c53ae am e55458fa: Merge "DO NOT MERGE Don\'t duplicate HTML in reply / forward" into honeycomb-mr1
* commit 'e55458fa4dcb27e686a9b5d37727c45fb8552875':
  DO NOT MERGE Don't duplicate HTML in reply / forward
2011-03-29 15:35:13 -07:00
Justin Ho
e55458fa4d Merge "DO NOT MERGE Don't duplicate HTML in reply / forward" into honeycomb-mr1 2011-03-29 15:16:00 -07:00
Eric Fischer
fa2047aacf am 936eb17e: am caf358ed: (-s ours) Import revised translations. DO NOT MERGE
* commit '936eb17e5ced0edeb89e9b7da75b559a8a4e4fbf':
  Import revised translations.  DO NOT MERGE
2011-03-29 14:19:57 -07:00
Eric Fischer
936eb17e5c am caf358ed: (-s ours) Import revised translations. DO NOT MERGE
* commit 'caf358ed753e64ce1bc8aeb65cf728aed19f8662':
  Import revised translations.  DO NOT MERGE
2011-03-29 14:07:19 -07:00
Eric Fischer
caf358ed75 Import revised translations. DO NOT MERGE
Change-Id: I4bb7445a1b1e83b2d34dccaea7cbb98e28461bbc
2011-03-29 13:29:51 -07:00
Eric Fischer
1b63120a3c am 7568aa93: Import revised translations. DO NOT MERGE
* commit '7568aa936a90e19c5ffb7f7451d6a3804485e52b':
  Import revised translations.  DO NOT MERGE
2011-03-29 12:25:01 -07:00
Eric Fischer
7568aa936a Import revised translations. DO NOT MERGE
Change-Id: I92eab36c38104024c0e885240f705e57303fb617
2011-03-29 11:59:24 -07:00
Andy Stadler
07a85746af Merge "DO NOT MERGE - Prevent NPE when account sender name is null" into gingerbread 2011-03-25 16:44:05 -07:00
Andy Stadler
aba60dfb73 Merge "DO NOT MERGE - Fix NPE when trying to open attachments" into gingerbread 2011-03-25 16:43:50 -07:00
Andy Stadler
064c187019 Merge "DO NOT MERGE - Fix NPE in pop3 checkcapabilities" into gingerbread 2011-03-25 16:43:42 -07:00
Andy Stadler
9258827315 DO NOT MERGE - Prevent NPE when account sender name is null
Bug: 3500373
Backport of: Id07270f34d9cc0523c46104b3167711b71798623

Change-Id: I23464e3edd9c8d8ecc54451cf7eabfddb73bd745
2011-03-25 16:29:53 -07:00
Andy Stadler
397439881a DO NOT MERGE - 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
Backport of: I831e3abd100664c92f7af585014a03250e40ff64

Change-Id: Iffdf8cdc3a17c0ab691596eb9e240ef87acb2e37
2011-03-25 16:11:09 -07:00
Todd Kennedy
5c9be9af18 DO NOT MERGE Don't duplicate HTML in reply / forward
On exchange servers that support "smart reply", the original message is
actually appended by the server. In this situation, we should not append
the original HTML text on the client.

bug 4177192

Change-Id: I0bdb34cf837e0cc0bfac8917f993ecb764814d97
2011-03-25 15:50:04 -07:00
Andy Stadler
0408ee5b94 DO NOT MERGE - Fix NPE in pop3 checkcapabilities
* This happens if an open fails immediately (error message in the
  initial banner) followed by a checkSettings.
* The fix is to harden checkSettings to force a clean connection
  every time.

Bug: 2170147
Backport of: If7403bf517477d2b03b21d71caab511fe45e234c

Change-Id: Ia6cc0e3ab0c8a8a78b5d8b8fb7b8ba4b4cdd3ef2
2011-03-25 15:08:34 -07:00
Andy Stadler
8f0a79c2ef DO NOT MERGE - Add 55 roadrunner email setups
Bug: 4086524
Backport Of: I8d7758d3720e45515abae1d071a8b149ac63a4ce

Change-Id: If5c20e9f8351864a7878a7eef229ab1e0ec850e1
2011-03-25 14:41:25 -07:00
Todd Kennedy
f52697f42a am 99930f81: Don\'t load from the network until specified
* commit '99930f81f1b7f1d5b769be958b3d1efe0aeef3fc':
  Don't load from the network until specified
2011-03-24 16:18:40 -07:00
Todd Kennedy
99930f81f1 Don't load from the network until specified
We were always loading from the network for HTML messages. Now we don't
load from the network until the user clicks the "display images" button.

Change-Id: I4cdfea5e5338f3bba70b3d04df6551516d3e1a85
2011-03-24 16:08:57 -07:00
Eric Fischer
1157196e36 am d6dbe885: (-s ours) am 73310179: Import revised translations. DO NOT MERGE
* commit 'd6dbe88595ce0e0a44110f1d714f758fe05f5246':
  Import revised translations.  DO NOT MERGE
2011-03-18 16:54:47 -07:00
Eric Fischer
d6dbe88595 am 73310179: Import revised translations. DO NOT MERGE
* commit '7331017905450502d0e8e0b849c01d136696d9af':
  Import revised translations.  DO NOT MERGE
2011-03-18 16:10:11 -07:00
Eric Fischer
7331017905 Import revised translations. DO NOT MERGE
Change-Id: I708facf4f7eebd708abd2a7b2db405a33afc7d00
2011-03-18 15:14:44 -07:00
Marc Blank
b50a766d4a Merge "Remove STOPSHIP logging" into honeycomb-mr1 2011-03-17 07:58:04 -07:00
Eric Fischer
b814d0b368 Import revised translations. DO NOT MERGE
Change-Id: I329f90d2668658f86572f1886ba17566f6da87b0
2011-03-16 17:01:33 -07:00
Marc Blank
da3c4b8261 Remove STOPSHIP logging
Change-Id: I73786fb2f4ff10d3c0767a873e5eb1e443f1affc
2011-03-16 11:08:56 -07:00
Andy Stadler
22759bacd9 Handle complex chars policy correctly
* We needed to set DevicePolicyMnager.PASSWORD_QUALITY_COMPLEX
* Setting this, we also need to clear some of the defaults for complex
  mode that are not correct for Exchange's definition of "complex".
* Unit tests

Bug: 4092218
Change-Id: Iea7bd05d48f1aa9406222c1db5937cfd7f2662b8
2011-03-16 09:48:08 -07:00
Andy Stadler
714b2f2da3 Merge "Reduce chance of crash when dismissing dialogs asynchronously" into honeycomb-mr1 2011-03-15 22:31:21 -07:00
Andy Stadler
f0a75b9d66 Merge "Add 55 roadrunner email setups" into honeycomb-mr1 2011-03-15 16:04:55 -07:00
Andy Stadler
a685d3b019 Reduce chance of crash when dismissing dialogs asynchronously
* Caught & diagnosed by crash while checking settings
* Also possible in MoveMessageToDialog

Bug: 3412875
Change-Id: Ie78c61cf5ca10ce1eedc25ba2eb97ed0ac5bc615
2011-03-15 15:02:48 -07:00
Eric Fischer
d85b9879f2 Import revised translations. DO NOT MERGE
Change-Id: I07a17bf7191b4cb8420ffb5c55dfe26600278a26
2011-03-15 14:47:59 -07:00
Andy Stadler
36e6f4931e Add 55 roadrunner email setups
Bug: 4086524
Change-Id: I8d7758d3720e45515abae1d071a8b149ac63a4ce
2011-03-15 13:51:57 -07:00
Todd Kennedy
9c795b025e Fix portrait widget header background
When the device is in portrait mode and the widget gets resized to be
narrow (2-by), the header background becomes corrupt. The new assets
now look correct at any size.

bug 3500861

Change-Id: I80a655c8822f2a14f9100afe32c893bf412ac936
2011-03-14 16:48:05 -07:00
Todd Kennedy
09f9fc5e4a Merge ""final" tweaks to widget" into honeycomb-mr1 2011-03-11 10:56:12 -08:00
Todd Kennedy
46b8ea4b53 "final" tweaks to widget
* Add the background to the widget
* Updated background to a stretchable 9-patch
* Shift "Tap icon to change" text up a couple pixels

bug 3510984

Change-Id: I5ea65b802098c1af08e865f85fb5470e0a00b76b
2011-03-11 10:54:29 -08:00
Andy Stadler
0820e00841 Merge "Fix race condition NPE caught by monkey" into honeycomb-mr1 2011-03-11 08:52:40 -08:00
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
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
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
70e99aa97f Merge "Fix download of non-smart-forwarded attachments" into honeycomb-mr1 2011-03-09 16:12:10 -08:00