Yu Ping Hu
d3eb8bcbc1
am 80f268e9
: Merge "Increment version number." into jb-ub-mail-ur9
...
* commit '80f268e91981bf600c897acc6426b09815702f31':
Increment version number.
2013-04-05 16:47:51 -07:00
Yu Ping Hu
757093d826
am 872f4a63
: am 29304760
: Reorder the folders in combined view.
...
* commit '872f4a63ef330c266cce69df4e28750ab3195f8b':
Reorder the folders in combined view.
2013-04-05 16:45:05 -07:00
Yu Ping Hu
80f268e919
Merge "Increment version number." into jb-ub-mail-ur9
2013-04-05 23:43:11 +00:00
Yu Ping Hu
872f4a63ef
am 29304760
: Reorder the folders in combined view.
...
* commit '293047605189eac463b03710ff2a7c1055a6a6dd':
Reorder the folders in combined view.
2013-04-05 16:41:18 -07:00
Yu Ping Hu
f332e9d938
Increment version number.
...
Change-Id: I97a37ca97d4260db1458acdc22522e89b38e0b51
2013-04-05 16:40:42 -07:00
Yu Ping Hu
2930476051
Reorder the folders in combined view.
...
Inbox should go to top.
Change-Id: I90c55952aaa3955adfd6d08a12a568bfb192c730
2013-04-05 16:35:51 -07:00
Paul Westbrook
16c7a85790
am dfed09fb
: am fcddd014
: Merge "email: "Exchange Services has stopped" - Rain of Exchange Javacrashes" into jb-ub-mail-ur9
...
* commit 'dfed09fb585f71a1b7d2e0cb5d29a3a524cd16e0':
email: "Exchange Services has stopped" - Rain of Exchange Javacrashes
2013-04-05 15:39:50 -07:00
Paul Westbrook
dfed09fb58
am fcddd014
: Merge "email: "Exchange Services has stopped" - Rain of Exchange Javacrashes" into jb-ub-mail-ur9
...
* commit 'fcddd014dafd33b2db74e51041e3fd0aef617fd6':
email: "Exchange Services has stopped" - Rain of Exchange Javacrashes
2013-04-05 15:37:24 -07:00
Paul Westbrook
fcddd014da
Merge "email: "Exchange Services has stopped" - Rain of Exchange Javacrashes" into jb-ub-mail-ur9
2013-04-05 22:35:37 +00:00
Yu Ping Hu
5b1014dd4c
am e0c8d13e
: am 1389f0ed
: Merge "Add virtual mailbox for all unread messages." into jb-ub-mail-ur9
...
* commit 'e0c8d13e81e44c91add6d26566b9e8079473884c':
Add virtual mailbox for all unread messages.
2013-04-05 15:32:30 -07:00
Yu Ping Hu
e0c8d13e81
am 1389f0ed
: Merge "Add virtual mailbox for all unread messages." into jb-ub-mail-ur9
...
* commit '1389f0ed03696a4be4891ce1247867a5dec6b08c':
Add virtual mailbox for all unread messages.
2013-04-05 15:29:05 -07:00
Yu Ping Hu
1389f0ed03
Merge "Add virtual mailbox for all unread messages." into jb-ub-mail-ur9
2013-04-05 22:25:56 +00:00
Emmanuel Berthier
689efab2b1
email: "Exchange Services has stopped" - Rain of Exchange Javacrashes
...
Cleanup some nasty records containing NULL fields.
Change-Id: Iec5e7e1bebc4beee8fa010c3f9c9ee723fd2cd83
Author: Emmanuel Berthier <emmanuel.berthier@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 60461
cherry-pick of https://android-review.googlesource.com/#/c/47571/1
2013-04-05 15:22:14 -07:00
Yu Ping Hu
c065e72819
Add virtual mailbox for all unread messages.
...
Also restores the trash icon. I'm not using the "correct"
icon -- it's the menu icon, not a folder icon -- but it
looks correct. Also, the "unread messages" icon is likewise
the menu icon for mark unread.
Bug: 8527132
Bug: 8444885
Change-Id: I7d3bc286f80f130e6f08ff1340a013d81700406e
2013-04-05 14:50:50 -07:00
Paul Westbrook
ad2f7b73f7
am c871f110
: am d402c890
: Fixed make POP and Imap more locale safe
...
* commit 'c871f110d3542359c99f6642db981583b4796855':
Fixed make POP and Imap more locale safe
2013-04-05 14:41:45 -07:00
Paul Westbrook
c871f110d3
am d402c890
: Fixed make POP and Imap more locale safe
...
* commit 'd402c890dc00e2a0b2cf215d8479e59fc3a252f3':
Fixed make POP and Imap more locale safe
2013-04-05 14:37:25 -07:00
Paul Westbrook
d402c890dc
Fixed make POP and Imap more locale safe
...
Cherry-picks from:
https://android-review.googlesource.com/#/c/42334/
https://android-review.googlesource.com/#/c/42332/
Change-Id: I557c3d8c725cf6dc4f13f227dcec63864ab5db67
2013-04-05 13:57:51 -07:00
Paul Westbrook
cda644c360
am 2cd5bb8d
: am 9fd03edb
: Merge "avoid cursor leak in email provider" into jb-ub-mail-ur9
...
* commit '2cd5bb8dd7178b72548b4b7d0586b95665705eef':
avoid cursor leak in email provider
2013-04-05 13:52:26 -07:00
Jack Bates
9a4d69c7d3
am c245696c
: am 4fd97a30
: Fix SMTP RFC violation for better interoperability
...
* commit 'c245696c3896d26bf063c9a45200637bfc0945fc':
Fix SMTP RFC violation for better interoperability
2013-04-05 13:52:26 -07:00
Paul Westbrook
2cd5bb8dd7
am 9fd03edb
: Merge "avoid cursor leak in email provider" into jb-ub-mail-ur9
...
* commit '9fd03edb83326c23fc4dd3944c140de913a4fe76':
avoid cursor leak in email provider
2013-04-05 13:50:26 -07:00
Jack Bates
c245696c38
am 4fd97a30
: Fix SMTP RFC violation for better interoperability
...
* commit '4fd97a305065dfed11adf50612e55b9647ceb236':
Fix SMTP RFC violation for better interoperability
2013-04-05 13:50:26 -07:00
Paul Westbrook
9fd03edb83
Merge "avoid cursor leak in email provider" into jb-ub-mail-ur9
2013-04-05 20:49:09 +00:00
Yoohyun.choi
89c74e89e5
avoid cursor leak in email provider
...
When cursor is done, the cursor must be closed to avoid cursor leak.
cherry-pick of https://android-review.googlesource.com/#/c/52910/
Change-Id: Iaaffed2c4e90dc4b17ae55fcedb242bf890b3dd5
2013-04-05 13:45:56 -07:00
Jack Bates
4fd97a3050
Fix SMTP RFC violation for better interoperability
...
Space after colon violates RFC 5321 (and RFC 821): "Since it has been a common
source of errors, it is worth noting that spaces are not permitted on either
side of the colon following FROM in the MAIL command or TO in the RCPT command"
Change-Id: Ie5330bf2bd01cd8f734134dadd742cf16df70d7a
Signed-off-by: Jack Bates <jack@nottheoilrig.com>
cherry-pick of https://android-review.googlesource.com/#/c/32640/
2013-04-05 13:42:13 -07:00
Paul Westbrook
f596434d82
am e9931d6d
: am 156163cc
: Prevent NPE
...
* commit 'e9931d6dba549766c3f70ad9abff4b12dffa4fcb':
Prevent NPE
2013-04-05 13:36:06 -07:00
Paul Westbrook
e9931d6dba
am 156163cc
: Prevent NPE
...
* commit '156163cceb5f56bb53e88e68d4e79bd5c076797f':
Prevent NPE
2013-04-05 13:33:05 -07:00
Paul Westbrook
156163cceb
Prevent NPE
...
cherry-pick of https://android-review.googlesource.com/#/c/45703/
Change-Id: I8d6984d90365d6bc3e9f102285a06ac9c32a98d4
2013-04-05 12:00:29 -07:00
Paul Westbrook
9122087514
am 8272b48f
: am 391a7fc0
: Support legacy shortcuts
...
* commit '8272b48f69a1b8d959244f09c3da1a15fa657c31':
Support legacy shortcuts
2013-04-04 13:46:45 -07:00
Paul Westbrook
8272b48f69
am 391a7fc0
: Support legacy shortcuts
...
* commit '391a7fc0e99457308b6f6bd9444c8aba94b0b7b1':
Support legacy shortcuts
2013-04-04 13:42:51 -07:00
Paul Westbrook
391a7fc0e9
Support legacy shortcuts
...
We need to support shortcuts that were created with previous versions
of Email
Bug: 8530220
Change-Id: I9e2a44b561f5617ffa954af37a9e78a95400f7dc
2013-04-04 02:45:17 -07:00
Mark Wei
65b8fef7ec
am 102df0ea
: am 30dec61d
: Merge "Attachments in Conversation List: UI changes to display attachment previews in the conversation list." into jb-ub-mail-ur9
...
* commit '102df0ea66ff2e5517e496bc245b39714867ec66':
Attachments in Conversation List: UI changes to display attachment previews in the conversation list.
2013-04-03 17:53:07 -07:00
Mark Wei
102df0ea66
am 30dec61d
: Merge "Attachments in Conversation List: UI changes to display attachment previews in the conversation list." into jb-ub-mail-ur9
...
* commit '30dec61dbd57ebfbdab7755d50d18471aab59178':
Attachments in Conversation List: UI changes to display attachment previews in the conversation list.
2013-04-03 17:51:16 -07:00
Mark Wei
30dec61dbd
Merge "Attachments in Conversation List: UI changes to display attachment previews in the conversation list." into jb-ub-mail-ur9
2013-04-04 00:47:57 +00:00
Baligh Uddin
07b61d7a10
am e02991c6
: (-s ours) am cca79c7d
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9
...
* commit 'e02991c6eeff713a898f739e4398ee520d2244ab':
Import translations. DO NOT MERGE
2013-04-03 15:17:08 -07:00
Baligh Uddin
e02991c6ee
am cca79c7d
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9
...
* commit 'cca79c7d7293227fe4912dc083108351f8fa9542':
Import translations. DO NOT MERGE
2013-04-03 15:14:06 -07:00
Baligh Uddin
8014b3a1ac
am 9e0992d6
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
...
* commit '9e0992d6ad1483b1e1c444c64dde23349dcb75d0':
Import translations. DO NOT MERGE
2013-04-03 15:13:57 -07:00
Baligh Uddin
cca79c7d72
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9
2013-04-03 22:09:50 +00:00
Baligh Uddin
fbd60e02a1
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11
2013-04-03 22:09:41 +00:00
Baligh Uddin
9e0992d6ad
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
2013-04-03 22:09:28 +00:00
Yu Ping Hu
3cd93d657e
am 2ae74add
: am f86e0321
: Merge "Restore functionality for uploading new messages." into jb-ub-mail-ur9
...
* commit '2ae74add6fcb80962d405afbefd554043f6fe4a8':
Restore functionality for uploading new messages.
2013-04-03 13:52:13 -07:00
Yu Ping Hu
2ae74add6f
am f86e0321
: Merge "Restore functionality for uploading new messages." into jb-ub-mail-ur9
...
* commit 'f86e03216bf0cc72554eb7da7d1f1c8faf1bb826':
Restore functionality for uploading new messages.
2013-04-03 13:49:57 -07:00
Yu Ping Hu
f86e03216b
Merge "Restore functionality for uploading new messages." into jb-ub-mail-ur9
2013-04-03 20:45:21 +00:00
Baligh Uddin
75b933594f
Import translations. DO NOT MERGE
...
Change-Id: I396772ee5921bc2e145b5c247f6935db81c34a08
Auto-generated-cl: translation import
2013-04-03 12:12:48 -07:00
Baligh Uddin
c942c8969a
Import translations. DO NOT MERGE
...
Change-Id: Ib3ebcb583875c03c605d805410636dcda720e2b1
Auto-generated-cl: translation import
2013-04-03 12:11:36 -07:00
Baligh Uddin
bc14105df7
Import translations. DO NOT MERGE
...
Change-Id: Id6f1cdce89b99619db5212ef06651955520a1f87
Auto-generated-cl: translation import
2013-04-03 12:09:50 -07:00
Yu Ping Hu
21c4b9d7b2
am 90f2a29d
: am 81ca6599
: Increment version number.
...
* commit '90f2a29da4782a34ff0a97b61d117ea1a5cc3c1f':
Increment version number.
2013-04-03 09:33:01 -07:00
Yu Ping Hu
c5c9c1c69e
Restore functionality for uploading new messages.
...
The code for syncing new messages from client to server
somehow never got moved from Email1 to Email2.
This change also includes minor cleanup on system mailbox
flags.
Bug: 8531552
Change-Id: I1f9396635ba14cb6e641d2bc1b506c6d702f6b2e
2013-04-03 09:32:35 -07:00
Yu Ping Hu
90f2a29da4
am 81ca6599
: Increment version number.
...
* commit '81ca6599be1c210a6c0182fe5e8b77bc97e7d5b7':
Increment version number.
2013-04-03 09:31:00 -07:00
Mark Wei
d7970b3635
Attachments in Conversation List: UI changes to display attachment previews
...
in the conversation list.
Depends on:
PhotoManager: https://googleplex-android-review.googlesource.com/#/c/285814/
Bug: 7481049
Change-Id: Ia9f93c4ce75a4c9be0e9b738d0347292e4b2faca
2013-04-02 19:22:38 -07:00
Yu Ping Hu
81ca6599be
Increment version number.
...
Change-Id: Ifff70ec6a013bbde97a8f8726f958665b6333570
2013-04-02 12:59:55 -07:00