Commit Graph

8558 Commits

Author SHA1 Message Date
Yu Ping Hu
e5088ba0d4 Increment email version.
Change-Id: I2c974b090f308cd30553796eda7d5c05d2327d8f
2013-06-19 11:57:16 -07:00
Yu Ping Hu
2ba828e51e am 5648390c: Increment Email version.
* commit '5648390caed26a460042f32720f9a8e1fd5fe85f':
  Increment Email version.
2013-06-19 11:55:28 -07:00
Yu Ping Hu
5648390cae Increment Email version.
Change-Id: I742889a46dc782868a536ab3ecc891463e1ac251
2013-06-19 11:50:33 -07:00
Yu Ping Hu
4e80c6febf am e9c811d8: Opt out email from limited users.
* commit 'e9c811d87d9ffdc6d5bcb8eaf5f21b6dc5e75c35':
  Opt out email from limited users.
2013-06-19 10:13:51 -07:00
Yu Ping Hu
e9c811d87d Opt out email from limited users.
Bug: 8630000
Change-Id: Ida0bf7c2336dccce7c01785e8cf8ac3f3ec29571
2013-06-18 18:32:38 -07:00
Yu Ping Hu
6e9a519923 am f44697e1: Merge "Return null instead of crashing when querying a bad folder." into jb-ub-mail-ur10
* commit 'f44697e15899f15607b474159c1ce745137dd9c7':
  Return null instead of crashing when querying a bad folder.
2013-06-18 18:28:57 -07:00
Yu Ping Hu
f44697e158 Merge "Return null instead of crashing when querying a bad folder." into jb-ub-mail-ur10 2013-06-19 01:24:35 +00:00
Yu Ping Hu
70500d2253 Return null instead of crashing when querying a bad folder.
Bug: 9250557
Change-Id: Ic0074fa1f6db53a7495c7de48a8f42158a0ea1d9
2013-06-18 18:13:45 -07:00
Paul Westbrook
945ad42795 am e7d539dd: Update the signature summary
* commit 'e7d539ddf94270ee716c331dd75c60731d598c1d':
  Update the signature summary
2013-06-18 16:38:14 -07:00
Paul Westbrook
e7d539ddf9 Update the signature summary
Bug: 9480853
Change-Id: I8996efa268c906485ee1d5cfcf0f883d40927009
2013-06-18 16:33:20 -07:00
Mark Wei
1930801bb1 am 33f92a7f: Change AOSP Email Makefile to reference current SDK.
* commit '33f92a7f96717279e15f6c5c14da1e5d893936d1':
  Change AOSP Email Makefile to reference current SDK.
2013-06-18 15:53:55 -07:00
Mark Wei
33f92a7f96 Change AOSP Email Makefile to reference current SDK.
Change-Id: Iab007efda5282b64eebbccdc2dd2b8e33177276c
2013-06-18 14:14:22 -07:00
Yu Ping Hu
ad151e8c7c am aa0ca16a: Remove references to account mailbox.
* commit 'aa0ca16a27e4a56a029e5cdebf96de5723bd84b6':
  Remove references to account mailbox.
2013-06-17 20:14:58 -07:00
Yu Ping Hu
aa0ca16a27 Remove references to account mailbox.
Exchange implementation no longer uses them.

Change-Id: I221a914f2428c0c7989f79392ca82f7a8f4b1c52
2013-06-17 19:51:47 -07:00
Yu Ping Hu
33780e4182 am e1f01694: Merge "Remove auto sync windows." into jb-ub-mail-ur10
* commit 'e1f0169419f06ce5c96006c944491155470dc729':
  Remove auto sync windows.
2013-06-17 09:58:49 -07:00
Yu Ping Hu
e1f0169419 Merge "Remove auto sync windows." into jb-ub-mail-ur10 2013-06-17 16:56:31 +00:00
Baligh Uddin
b331ac2ab2 am 596f4d43: (-s ours) Import translations. DO NOT MERGE
* commit '596f4d43c0ec68f25821ceefe8b1cec971abb9a4':
  Import translations. DO NOT MERGE
2013-06-15 19:41:51 -07:00
Baligh Uddin
aca641cbfe Import translations. DO NOT MERGE
Change-Id: Ia3e8ae9f5d8d0959524170886cc9a07c8a94426e
Auto-generated-cl: translation import
2013-06-14 22:37:26 -07:00
Baligh Uddin
596f4d43c0 Import translations. DO NOT MERGE
Change-Id: Iaeb2f5446c872b9d72af83886af5ebb3d4648400
Auto-generated-cl: translation import
2013-06-14 22:36:50 -07:00
Yu Ping Hu
21b2522d7f Remove auto sync windows.
Also includes other DB upgrade code.

Bug: 8668336
Bug: 9226612

Change-Id: Id9664fd8cda466ec34862a793e41cbcce78efb4c
2013-06-14 18:26:42 -07:00
Paul Westbrook
a06e4c8c08 am e16ad492: Merge "Move support for settings menu to UnifiedEmail" into jb-ub-mail-ur10
* commit 'e16ad492a650d9c0485a0b7fa85ec8a957717524':
  Move support for settings menu to UnifiedEmail
2013-06-13 23:36:42 -07:00
Paul Westbrook
e16ad492a6 Merge "Move support for settings menu to UnifiedEmail" into jb-ub-mail-ur10 2013-06-14 06:32:53 +00:00
Baligh Uddin
d40db275a9 am 6e7b1a1d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
* commit '6e7b1a1df8d126170e87bec08300cdbe6062a604':
  Import translations. DO NOT MERGE
2013-06-13 09:18:35 -07:00
Baligh Uddin
8603c21043 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11 2013-06-13 16:16:46 +00:00
Baligh Uddin
6e7b1a1df8 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10 2013-06-13 16:16:31 +00:00
Paul Westbrook
525e8ad321 Move support for settings menu to UnifiedEmail
Move the base settings menu to UnifiedEmail

Bug: 9393150
Change-Id: Ifa69125d84802a0d7dd2275e4704ec7a4d1fb2f1
2013-06-12 23:52:43 -07:00
Baligh Uddin
8a3c28f6b5 Import translations. DO NOT MERGE
Change-Id: If8df314150da80dbb67e20c3951e4a143ac36081
Auto-generated-cl: translation import
2013-06-12 13:58:07 -07:00
Baligh Uddin
29c0418674 Import translations. DO NOT MERGE
Change-Id: I2cdf5897618f805dc6411b92ccc5940c753ef27f
Auto-generated-cl: translation import
2013-06-12 13:57:29 -07:00
Scott Kennedy
79ac12685f am 380985ad: Merge "Move to Inbox" into jb-ub-mail-ur10
* commit '380985add95d003cda6c6d6804292b8a3b4f99e8':
  Move to Inbox
2013-06-12 13:03:26 -07:00
Scott Kennedy
380985add9 Merge "Move to Inbox" into jb-ub-mail-ur10 2013-06-12 20:02:12 +00:00
Yu Ping Hu
64b9335421 am 6d1cfd26: Merge "Add some null checks." into jb-ub-mail-ur10
* commit '6d1cfd2630c48c541950ff8625ea751dbf4dc011':
  Add some null checks.
2013-06-12 11:35:41 -07:00
Yu Ping Hu
6d1cfd2630 Merge "Add some null checks." into jb-ub-mail-ur10 2013-06-12 18:34:20 +00:00
Scott Kennedy
1079b6e962 Move to Inbox
Add a new Account setting field: Uri moveToInbox
This contains the Uri to use for the "move to inbox" action, which
may differ from defaultInbox.

There is no Move to Inbox in Email right now.

Bug: 9256654
Change-Id: I7c81c8115eda83123a09a9b7da7adf97a3c79964
2013-06-11 19:56:44 -07:00
Yu Ping Hu
6fadd5a0bd Add some null checks.
Bug: 9393662
Change-Id: I8c47b701062fb91e0e622644a26b470e78f62014
2013-06-11 16:56:06 -07:00
Andrew Sapperstein
42799f5694 am ae8e0b7a: Export Eml viewer.
* commit 'ae8e0b7ac37a115240ab912796805d69766e11f9':
  Export Eml viewer.
2013-06-11 16:13:27 -07:00
Andrew Sapperstein
ae8e0b7ac3 Export Eml viewer.
There's really no reason why it shouldn't be
and having it exported prevents b/9334785 from occurring.

Change-Id: Icaf9e90bc1f2e7bb35dba27ccb380ffa9ae7acbb
2013-06-11 15:01:05 -07:00
Baligh Uddin
9a6f0902a2 am 6853ff91: (-s ours) Import translations. DO NOT MERGE
* commit '6853ff91c8b4303063022e3129ddaa1db563cc4a':
  Import translations. DO NOT MERGE
2013-06-11 09:43:19 -07:00
Baligh Uddin
f471973482 Import translations. DO NOT MERGE
Change-Id: I7442ad4268ff6f4ab11f6f7fea33ef435415fa90
Auto-generated-cl: translation import
2013-06-10 11:05:18 -07:00
Baligh Uddin
6853ff91c8 Import translations. DO NOT MERGE
Change-Id: Iaa121b50d24ad5ea97e0b95925699eb75da42d36
Auto-generated-cl: translation import
2013-06-10 11:04:38 -07:00
Paul Westbrook
4c9b0a2519 am 38f22dbf: Use "show pictures" code from UnifiedEmail
* commit '38f22dbf08664b885b4cf063ea665c02edfb1c32':
  Use "show pictures" code from UnifiedEmail
2013-06-07 19:34:04 -07:00
Paul Westbrook
38f22dbf08 Use "show pictures" code from UnifiedEmail
Bug: 9320770
Change-Id: I701a93e2f09b8405a2c4bc56f7793f5abadbcd1e
2013-06-07 18:09:57 -07:00
Paul Westbrook
2abfbbaea8 am 0ec8c365: Merge "Fix logging crash" into jb-ub-mail-ur10
* commit '0ec8c365e795d9a73ecae0ba00fa0535e57e528e':
  Fix logging crash
2013-06-06 17:25:42 -07:00
Paul Westbrook
0ec8c365e7 Merge "Fix logging crash" into jb-ub-mail-ur10 2013-06-07 00:24:14 +00:00
Paul Westbrook
5a3fe57f4e Fix logging crash
If the string contains a character that is intrepreted by the
string formatter, this would throw an exception

Change-Id: I60cccb539bf197fa555d8d1f0fa1bdca3e07114e
2013-06-06 17:20:52 -07:00
Andrew Sapperstein
d2d2c1ace6 am 3df361a5: Merge "Add additional eml mime type." into jb-ub-mail-ur10
* commit '3df361a577e2420a1ab8301bdbf5f413dcd6bf97':
  Add additional eml mime type.
2013-06-06 16:08:17 -07:00
Andrew Sapperstein
3df361a577 Merge "Add additional eml mime type." into jb-ub-mail-ur10 2013-06-06 23:07:02 +00:00
Andrew Sapperstein
c035a693e7 Add additional eml mime type.
Still wanna support application/eml even though
I doubt we'll ever see it.

Change-Id: I5dd74e5882b40d136f3849bb2500de0e5cbba24c
2013-06-06 15:51:50 -07:00
Paul Westbrook
6ab29bfed1 am 555bd3c0: Don\'t show search folder
* commit '555bd3c0b7132509421ae181fbdb35995819787c':
  Don't show search folder
2013-06-06 13:03:18 -07:00
Scott Kennedy
9a054c20da am 4c47dadf: Merge "Unify LogTag" into jb-ub-mail-ur10
* commit '4c47dadf1848f34ee3a67caf6faacdb906685645':
  Unify LogTag
2013-06-06 11:08:01 -07:00
Paul Westbrook
555bd3c0b7 Don't show search folder
In folder lists, don't show the search folder

Bug: 9227357
Change-Id: Ic0b8a39929f6d2528f445d3746c4eb1915275593
2013-06-06 11:06:38 -07:00