Commit Graph

9437 Commits

Author SHA1 Message Date
Yu Ping Hu
0fb9b9efe6 am 294a4248: Merge "Fix off by one error." into jb-ub-mail-ur10
* commit '294a4248beae466c7aa19ad5b5683d35ed053f7a':
  Fix off by one error.
2013-11-01 17:27:04 -07:00
Tony Mantler
e1064b9222 Merge "Foreign characters may be letters and digits, but they're not allowed in Uri/Url schemes" into jb-ub-mail-ur10 2013-11-01 22:20:53 +00:00
Yu Ping Hu
294a4248be Merge "Fix off by one error." into jb-ub-mail-ur10 2013-11-01 22:19:38 +00:00
Yu Ping Hu
1a6a3fe797 Fix off by one error.
Bug: 11475318
Change-Id: I046fc66713c54f355a3dc4e6b7b7b288a1450326
2013-11-01 10:36:44 -07:00
Baligh Uddin
5c4fbb187d am 82868225: (-s ours) am bd68009d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
* commit '8286822520f94d301eca2d091ad4dca37a2053d0':
  Import translations. DO NOT MERGE
2013-11-01 08:00:51 -07:00
Baligh Uddin
8286822520 am bd68009d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
* commit 'bd68009dfdca76d67667880fca79328c11e30407':
  Import translations. DO NOT MERGE
2013-11-01 07:58:00 -07:00
Baligh Uddin
5e2d28a502 am 27a788f7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11
* commit '27a788f74098167085ee8a3f34ebd6e613690104':
  Import translations. DO NOT MERGE
2013-11-01 07:57:34 -07:00
Baligh Uddin
143dab5908 Merge "Import translations. DO NOT MERGE" into ub-mail-ur12 2013-11-01 14:55:35 +00:00
Baligh Uddin
27a788f740 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11 2013-11-01 14:55:22 +00:00
Baligh Uddin
bd68009dfd Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10 2013-11-01 14:55:17 +00:00
Martin Hibdon
2d49f0df50 am c085911e: Merge "Add logging to see why attachments fail to load" into jb-ub-mail-ur10
* commit 'c085911eeeb18059be403b1a506d50f2cc807b43':
  Add logging to see why attachments fail to load
2013-10-31 18:26:30 -07:00
Martin Hibdon
c085911eee Merge "Add logging to see why attachments fail to load" into jb-ub-mail-ur10 2013-11-01 01:22:15 +00:00
Tony Mantler
2ed113c713 Foreign characters may be letters and digits, but they're not allowed in Uri/Url schemes
b/11356390

Change-Id: Ic510607ab5f671e3f3f474ea3c2f4af7e9966cb1
2013-10-31 16:39:03 -07:00
Tony Mantler
a3e839cca9 am 3ddd39b6: Merge "Don\'t add Quick Response menu if there\'s no mReplyFromAccount" into jb-ub-mail-ur10
* commit '3ddd39b6f1e3bfa0b10443627dd14067502941dd':
  Don't add Quick Response menu if there's no mReplyFromAccount
2013-10-31 14:15:46 -07:00
Martin Hibdon
5ed194434f Add logging to see why attachments fail to load
b/11436795
Now, if we ever insert or update an attachment to have
a blank location, we'll log a warning with stack trace.
Also, logging from ADS now uses the same log tag as everything
else, so we'll be able to see it without needing to turn
on some funny log tag.

Change-Id: Ic566cd87e8893128d074b897d7594a01ae12bc8c
2013-10-31 14:11:41 -07:00
Tony Mantler
3ddd39b6f1 Merge "Don't add Quick Response menu if there's no mReplyFromAccount" into jb-ub-mail-ur10 2013-10-31 21:11:32 +00:00
Tony Mantler
b0d82fecff Don't add Quick Response menu if there's no mReplyFromAccount
b/11361756

Change-Id: I880d8f2089c1a50d13367b6fcf64344070280e27
2013-10-31 10:43:29 -07:00
Yu Ping Hu
0fe768e40c am 6ceae42b: Merge "Add a provider call to get device friendly name." into jb-ub-mail-ur10
* commit '6ceae42b30e03399513b29d401319666915096d5':
  Add a provider call to get device friendly name.
2013-10-30 16:10:13 -07:00
Yu Ping Hu
6ceae42b30 Merge "Add a provider call to get device friendly name." into jb-ub-mail-ur10 2013-10-30 23:07:52 +00:00
Tony Mantler
81bedbef2e am 2a33eccd: Merge "Don\'t initiate fragment transactions from onDestroy()" into jb-ub-mail-ur10
* commit '2a33eccd19ac32bb75f419b6379586de903c78af':
  Don't initiate fragment transactions from onDestroy()
2013-10-30 14:15:07 -07:00
Tony Mantler
2a33eccd19 Merge "Don't initiate fragment transactions from onDestroy()" into jb-ub-mail-ur10 2013-10-30 21:12:06 +00:00
Baligh Uddin
0aa577ccba Import translations. DO NOT MERGE
Change-Id: I4d413243206349a807d106b824f0a5021928a418
Auto-generated-cl: translation import
2013-10-30 12:24:08 -07:00
Baligh Uddin
89479d8583 Import translations. DO NOT MERGE
Change-Id: I490206f201dfbe20bc07d6babe89348c8600b521
Auto-generated-cl: translation import
2013-10-30 12:21:01 -07:00
Baligh Uddin
f6ddafe539 Import translations. DO NOT MERGE
Change-Id: Ib8715bd36401ec8959d2eabe87a1110a56576458
Auto-generated-cl: translation import
2013-10-30 12:20:19 -07:00
Yu Ping Hu
5181cd6d4a Add a provider call to get device friendly name.
For now, it sends the device model name as friendly name, in lieu
of actually having a user-supplied friendly name. This is wrong
for at least two reasons:

1) We need to have an actual user-supplied friendly name, but that's
   not easy to find.
2) This really shouldn't be a provider query -- it should be something
   the Exchange can know locally (ideally this is a system preference
   but that's not currently implemented). This workaround just lets
   us have some reasonable value that we can update easily.

Bug: 11161234
Change-Id: If83ad768736de19c9d0e833d1f86a6ce9daf5039
2013-10-30 11:50:41 -07:00
Alice Yang
8e3bd14c27 Merge "Always ask before displaying images for Email" into jb-ub-mail-ur11 2013-10-30 17:58:20 +00:00
Alice Yang
24a489c3de Always ask before displaying images for Email
In Gmail, we are adding a setting that automatically shows external
images instead of asking user first.  Email app should preserve old
behavior.

Bug 11158252

Change-Id: I8b04a1ec31638d756dfee2da8ab2e8178a709416
2013-10-30 10:07:59 -07:00
Alon Albert
3ffffaffe8 am 3e8e5979: Null Protect Account Info
* commit '3e8e59798b718e034da8c250e706e6429c41c2a5':
  Null Protect Account Info
2013-10-29 17:04:46 -07:00
Alon Albert
3e8e59798b Null Protect Account Info
Bug: 11355850
Change-Id: Idb42769b3009787efb4edfe2ffbd65171cd8d8d8
2013-10-29 16:47:24 -07:00
Tony Mantler
9460be06aa Don't initiate fragment transactions from onDestroy()
b/10918608

Change-Id: I649c5f86e5f77fa2ade33345969a44ffebb463b9
2013-10-29 15:44:34 -07:00
Alon Albert
714f883302 am eb280d1b: Merge "Disable Move Actions for POP3 Folders" into jb-ub-mail-ur10
* commit 'eb280d1b457cef098e2d5fe70fb7a83aa1c18121':
  Disable Move Actions for POP3 Folders
2013-10-29 12:38:51 -07:00
Alon Albert
eb280d1b45 Merge "Disable Move Actions for POP3 Folders" into jb-ub-mail-ur10 2013-10-29 19:36:17 +00:00
Alon Albert
ae46818a19 Disable Move Actions for POP3 Folders
Bug: 11311812
Change-Id: I5813281cca76b9b4a373b5b40dbbd1909800f951
2013-10-29 11:06:36 -07:00
Yu Ping Hu
fb1bd1fbcb am edebff6d: Increment Email version.
* commit 'edebff6db30899cef530dbad3e09a1889c1362e5':
  Increment Email version.
2013-10-29 10:01:01 -07:00
Yu Ping Hu
edebff6db3 Increment Email version.
Change-Id: Ia8dc17f106d5bbadcb3fe17d545120712718f56c
2013-10-25 18:21:25 -07:00
Yu Ping Hu
5a93fb16cb am feacaf63: Do not try to load nameless attachments.
* commit 'feacaf6351ad981890fd6dc790added452e3a570':
  Do not try to load nameless attachments.
2013-10-25 14:37:19 -07:00
Yu Ping Hu
feacaf6351 Do not try to load nameless attachments.
Bug: 11347094
Change-Id: I46321755cebe25858c0188f35270d428dfe4a435
2013-10-25 14:21:02 -07:00
Tony Mantler
2c1b6213d1 am 19b89b4b: Merge "Oh account name/email mixups, I\'ve missed you so (no I haven\'t)" into jb-ub-mail-ur10
* commit '19b89b4beaa7b3fb4a23d426e8e6c0210498a270':
  Oh account name/email mixups, I've missed you so (no I haven't)
2013-10-25 13:16:46 -07:00
Tony Mantler
19b89b4bea Merge "Oh account name/email mixups, I've missed you so (no I haven't)" into jb-ub-mail-ur10 2013-10-25 20:14:38 +00:00
Tony Mantler
20367f1589 Oh account name/email mixups, I've missed you so (no I haven't)
b/11341847

Change-Id: Ib3d13e28f742e6cac84795d46121e4be2994abba
2013-10-25 10:02:06 -07:00
Yu Ping Hu
8c50fe285d am 7b7d7d5c: Fix DB upgrade code.
* commit '7b7d7d5cb57c9f0e589b686511eabf3c73f96f00':
  Fix DB upgrade code.
2013-10-25 08:44:50 -07:00
Yu Ping Hu
7b7d7d5cb5 Fix DB upgrade code.
Bug: 11294681
Change-Id: I7333aabbdb9e45154d83386b85398e6d108e5bf2
2013-10-24 19:58:40 -07:00
Yu Ping Hu
1a8a4e8201 am 66f85c87: Merge "Add an additional mailbox key column to message table" into jb-ub-mail-ur10
* commit '66f85c878cebdf2683ae6181086a4d01e769c4e8':
  Add an additional mailbox key column to message table
2013-10-24 16:02:30 -07:00
Yu Ping Hu
66f85c878c Merge "Add an additional mailbox key column to message table" into jb-ub-mail-ur10 2013-10-24 22:59:40 +00:00
Yu Ping Hu
e232140461 am 4b73385e: Merge "Prevent a NPE in ImapService search handling" into jb-ub-mail-ur10
* commit '4b73385ecbdae7857331a2a0b6f71c18ccd94b97':
  Prevent a NPE in ImapService search handling
2013-10-24 15:59:19 -07:00
Yu Ping Hu
4b73385ecb Merge "Prevent a NPE in ImapService search handling" into jb-ub-mail-ur10 2013-10-24 22:56:29 +00:00
Martin Hibdon
7dad461e9e Prevent a NPE in ImapService search handling
b/11339972

Change-Id: Ief34e6e1fd59d029847dc8525a34f20ea9de26b1
2013-10-23 16:44:31 -07:00
Tony Mantler
a250e81410 am 340a29e5: Merge "Restore sender snippet for nested folder teaser." into jb-ub-mail-ur10
* commit '340a29e5fac431fceae6a54fd5b85b87861396ef':
  Restore sender snippet for nested folder teaser.
2013-10-23 15:45:25 -07:00
Tony Mantler
340a29e5fa Merge "Restore sender snippet for nested folder teaser." into jb-ub-mail-ur10 2013-10-23 22:42:39 +00:00
Tony Mantler
7a18b83a4f am e3cf91af: Set parentServerId for IMAP folders to prevent fixup code from resetting parentKey
* commit 'e3cf91af61fed0b35ef8cbb5790c39a143af7470':
  Set parentServerId for IMAP folders to prevent fixup code from resetting parentKey
2013-10-23 15:42:16 -07:00