Commit Graph

14206 Commits

Author SHA1 Message Date
Geoff Mendal
ded6357d8a am 4301e602: (-s ours) am 268485ff: (-s ours) am b188964b: (-s ours) am 96ade4e2: (-s ours) Import translations. DO NOT MERGE
* commit '4301e602d5d2b7b41d41d39747a8dffbdff1262c':
  Import translations. DO NOT MERGE
2014-11-02 18:53:49 +00:00
Tony Mantler
12a5933af3 am aee74ef4: am f495b95d: am 67b60f66: am b57bca27: Default to encrypted connections (YAY!)
* commit 'aee74ef40d1521f5301d803e9c275285d9d719ee':
  Default to encrypted connections (YAY!)
2014-11-02 18:53:48 +00:00
Martin Hibdon
6efb1c66d0 am 7c74d82b: am ab743fb5: am 0f6acb54: am f0bbcd85: Add additional analytics regarding our SSLSockets
* commit '7c74d82bc6580c1fbc1daf387d2c0e7bdc51c585':
  Add additional analytics regarding our SSLSockets
2014-11-02 18:53:47 +00:00
Martin Hibdon
c9030e14ab am 30d6f046: am 97951159: am 0e1bdee9: am 21dc44d2: Merge "Add analytics to track of what cipher suites are being used" into ub-gmail-ur14-dev
* commit '30d6f0460ce31d190782aa3654c6aeb493d1bd32':
  Add analytics to track of what cipher suites are being used
2014-11-02 18:53:46 +00:00
Martin Hibdon
6b1f582457 am 94190da3: am dc6f3aaf: am 85d0fdbe: am 303b553b: Allow an external security provider to be installed
* commit '94190da369c5c7e4dea7644f9bffb7c994f3576c':
  Allow an external security provider to be installed
2014-11-02 18:53:43 +00:00
Martin Hibdon
78f4dcb52b am 04b77626: am a67e2212: am be216a96: am a908d45a: Merge "Add deprecated cipher suites to our SSLSocket" into ub-gmail-ur14-dev
* commit '04b776268b067b4fb56ee9f3f3fedfe465f5eac3':
  Add deprecated cipher suites to our SSLSocket
2014-11-02 18:53:42 +00:00
Anthony Lee
4018b9cc9e am cadbc47f: am 4827f0bc: am f85d9e08: am 9d73facf: Merge "Fix restoreBodySource key so it returns the correct value." into ub-gmail-ur14-dev
* commit 'cadbc47f7963e8a36c91affb2fc5e23a3f36ccbf':
  Fix restoreBodySource key so it returns the correct value.
2014-11-02 18:53:40 +00:00
Martin Hibdon
4d587d6c73 am dedad5cc: am c0e8417e: am d77bf0c6: am 764d7b2f: Merge "Disable smart foward/reply" into ub-gmail-ur14-dev
* commit 'dedad5ccf7cfa01cba80dfe7a087a86a9b193c24':
  Disable smart foward/reply
2014-11-02 18:53:39 +00:00
Geoff Mendal
c702530866 am 08fdc12c: (-s ours) am 96815698: (-s ours) am 34418383: (-s ours) am 98f764fb: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '08fdc12c4846eddb04e22b313ea0134caca967b7':
  Import translations. DO NOT MERGE
2014-11-02 18:53:38 +00:00
Tony Mantler
64bbe34de9 am 12866ff1: am 0f3a01a4: am 14286249: am d716d894: Don\'t assume mHostAuthRecv is loaded when checking outgoing
* commit '12866ff17eee1778ce5b2571d030faef3454917f':
  Don't assume mHostAuthRecv is loaded when checking outgoing
2014-11-02 18:53:37 +00:00
Tony Mantler
35ffcc3a0b am bf98b875: am d82ae435: am 461d3e74: am 1182e1f9: Merge "Fix handling AOL\'s login rejection" into ub-gmail-ur14-dev
* commit 'bf98b875c23a859e5cb711298c0d5f190bd4fb7d':
  Fix handling AOL's login rejection
2014-11-02 18:53:36 +00:00
Baligh Uddin
78d1614ec4 am 38a40ba6: (-s ours) am 8e9d01c9: (-s ours) am 2782b49d: (-s ours) am c2061fb3: (-s ours) Import translations. DO NOT MERGE
* commit '38a40ba654b8b8ebfae61e508e611fd6dac0683b':
  Import translations. DO NOT MERGE
2014-11-02 18:53:35 +00:00
Régis Décamps
98ceb1d9ca am b6785995: am 53e49db3: am 955b9f96: am d7192f02: Provider configuration for outlook, yahoo, gmx
* commit 'b678599530a437e90b8672d1fc4db1dc30d9cf7a':
  Provider configuration for outlook, yahoo, gmx
2014-11-02 18:53:33 +00:00
Martin Hibdon
40b9f3c7df am f0987d36: am 9332c48f: am 349e6b91: am f61e098a: Correctly update UI_SYNC_STATUS upon search
* commit 'f0987d3603fedb63aeafd38d7c0ba8c505a1927e':
  Correctly update UI_SYNC_STATUS upon search
2014-11-02 18:53:32 +00:00
Geoff Mendal
b4c0eba750 am fe58e8e0: (-s ours) am 683ceefa: (-s ours) am feb9d48a: (-s ours) am 58685874: (-s ours) Import translations. DO NOT MERGE
* commit 'fe58e8e04615c58b88fd9478e5b0453ede53270c':
  Import translations. DO NOT MERGE
2014-11-02 18:53:31 +00:00
Régis Décamps
81d5ed1f10 am b5e2358f: am fad80911: am 4ed38cc1: am 2128e365: Merge "Resend notifications when Accounts are changed" into ub-gmail-ur14-dev
* commit 'b5e2358fc113ee61aea6819d1bfe567701249bf4':
  Resend notifications when Accounts are changed
2014-11-02 18:53:30 +00:00
Martin Hibdon
e8bcbd3159 am 06a3b269: am 1a10b8f7: am e4a62a76: am 7b44fda9: Merge "Set mailbox uiSyncStatus when IMAP and POP folders are created" into ub-gmail-ur14-dev
* commit '06a3b26964bba4ce091272ebeedfa908c24cde11':
  Set mailbox uiSyncStatus when IMAP and POP folders are created
2014-11-02 18:53:29 +00:00
Tony Mantler
5249a10e8c am 200adbe9: am 14c08377: am 06e38818: am f9757504: Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev
* commit '200adbe935ffc182994ec2df341b4bed86e1272a':
  Reload settings immediately after toggling sync
2014-11-02 18:53:28 +00:00
Tony Mantler
bd9add46f6 am 22d25e37: am 6a9a2f43: am 433f689c: am 1d929d18: Initial account setup analytics
* commit '22d25e3767897948bfde73ab0c0d93af964bedfa':
  Initial account setup analytics
2014-11-02 18:53:26 +00:00
Geoff Mendal
107cacf51e am 94c660a0: (-s ours) am fba6f6f3: (-s ours) am 863984a7: (-s ours) am 4012d748: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '94c660a0bb7ec7df04e098e81d65213b3ad33bcb':
  Import translations. DO NOT MERGE
2014-11-02 18:53:25 +00:00
Rohan Shah
94409eea47 am 56fd0d48: am 0fd02688: am d1599a86: am 72f6a243: Revert "Update notification icon asset names (Email)"
* commit '56fd0d48b620968cfcd7118b95e3c8da59c4dbe9':
  Revert "Update notification icon asset names (Email)"
2014-11-02 18:53:24 +00:00
Rohan Shah
9e15a6537e am c33016dc: am 56caa6e1: am bcbe5794: am cc82965a: Update notification icon asset names (Email)
* commit 'c33016dc12aa4cd743926fcffc3f39874f699e8c':
  Update notification icon asset names (Email)
2014-11-02 18:53:23 +00:00
Martin Hibdon
f120e97a74 am 28230ce5: am d51891fb: am 901255ce: am 5fde01e4: Merge "Set the search mailbox\'s syncState as soon as a search is requested" into ub-gmail-ur14-dev
* commit '28230ce5c86693e93d8a30b1fec2a2ed351ef21c':
  Set the search mailbox's syncState as soon as a search is requested
2014-11-02 18:53:12 +00:00
Martin Hibdon
562f5c9609 am 62318ee6: am f9292376: am 8a99e742: am 89272781: EmailProvider now supports query and getType for cached file urls
* commit '62318ee61f8e1230aa954e5b0b10f5dc9089f555':
  EmailProvider now supports query and getType for cached file urls
2014-11-02 18:53:11 +00:00
Tony Mantler
0989761529 am 92532b1c: am 9d3b1a8d: am 06cc928f: am 1927361b: Merge "Account authentication restyling" into ub-gmail-ur14-dev
* commit '92532b1c213f68aa476b18aded29025393d1de38':
  Account authentication restyling
2014-11-02 18:53:10 +00:00
Régis Décamps
66af7782fe am f24a5de9: am d606e825: am f62b6843: am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev
* commit 'f24a5de95bbe5d4ee9fd92877bb24bb7c9198ed0':
  Replace "Corporate" by "Exchange".
2014-11-02 18:53:09 +00:00
Tony Mantler
18e8b55b75 am 2b39de91: am 815252ad: am 31966801: am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev
* commit '2b39de91bd3ff844b2b57ef4a3ad49bff5b9279d':
  Restyle account setup flow nav buttons
2014-11-02 18:53:07 +00:00
Geoff Mendal
b64e1d2668 am 813b5b9d: (-s ours) am f3a519c2: (-s ours) am d7063821: (-s ours) am 2a1daaae: (-s ours) Import translations. DO NOT MERGE
* commit '813b5b9d78bb12baf42b8c4ecd37ced753fc7e8e':
  Import translations. DO NOT MERGE
2014-11-02 18:53:06 +00:00
Baligh Uddin
a4ec3b6348 am 037c4356: (-s ours) am 8182d3a7: (-s ours) am a3bfe727: (-s ours) am ab3ed2cb: (-s ours) Import translations. DO NOT MERGE
* commit '037c43569e3ef52639c1480f1834f3dd8601410f':
  Import translations. DO NOT MERGE
2014-11-02 18:53:05 +00:00
Martin Hibdon
f44db892ec am b8209a4c: am c7d52321: am 9ef12d1b: am 46f1b89f: Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev
* commit 'b8209a4c6ad160f2f65c7fb57d86a6967f45a8ad':
  Get SSLSocketFactory from GmsCore
2014-11-02 18:53:03 +00:00
Anthony Lee
51710a73cd am 82319a98: am 468a0417: am c95714b3: am ec8c2ac9: Merge "Calculate available background threads for AttachmentService correctly." into ub-gmail-ur14-dev
* commit '82319a98679e1882a2ae0358f347e25e5ab1e836':
  Calculate available background threads for AttachmentService correctly.
2014-11-02 18:53:02 +00:00
Rohan Shah
e1c103dc6e am 93a6c2c3: am 80f4af5a: am cf3aad64: am 42a4f201: Move Email Icons (Email)
* commit '93a6c2c36adfa051192822c99c3dc2a834accab9':
  Move Email Icons (Email)
2014-11-02 18:53:01 +00:00
Rohan Shah
7073065d34 am 2df883ac: am 3884149d: am a7d316c4: am 083a0138: Merge "Update Email Icons" into ub-gmail-ur14-dev
* commit '2df883ac0947958ed97cd83e90998d8a5ed02729':
  Update Email Icons
2014-11-02 18:53:00 +00:00
Rohan Shah
0114c4017f am 9486b751: am 6cef32da: am a4b5463d: am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev
* commit '9486b7512ee4eb30136593f29290ba6f56b8803d':
  Revert "Clean-up Email Icons"
2014-11-02 18:52:59 +00:00
Rohan Shah
e57e10a434 am d2ad0933: am 67df0850: am 8a305452: am 6a533823: Merge "Clean-up Email Icons" into ub-gmail-ur14-dev
* commit 'd2ad0933973dcee022f57231ed946d848bcc8e8c':
  Clean-up Email Icons
2014-11-02 18:52:57 +00:00
Tony Mantler
0c6747a60d am 941d0a46: am 2ba65aec: am fa93a71b: am b62067e3: Make sure old body files don\'t contaminate new messages
* commit '941d0a4661ef13189f9696949947e5d40f6014ad':
  Make sure old body files don't contaminate new messages
2014-11-02 18:52:56 +00:00
James Lemieux
f247d7e02e am 417c1ded: am c909ad16: am 826e61c0: am 69ba565b: Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev
* commit '417c1deda20fd5cb76940038a2762a0f0de0b003':
  Combined view should also display client-side sanitized HTML
2014-11-02 18:52:55 +00:00
James Lemieux
bb8efd3583 am ab841bb5: am 05629b29: am e811c774: am 40236a89: Display sync errors using snackbar and not as a TL footer
* commit 'ab841bb5548dbf40ff896ad2e2ad128db676af72':
  Display sync errors using snackbar and not as a TL footer
2014-11-02 18:52:54 +00:00
Baligh Uddin
9d6bb2cf84 am a8fee47f: (-s ours) am 5edde56b: (-s ours) am 28a37183: (-s ours) am abd75d1a: (-s ours) Import translations. DO NOT MERGE
* commit 'a8fee47f76fceee347cfbea0d7afd1673736acd0':
  Import translations. DO NOT MERGE
2014-11-02 18:52:53 +00:00
Régis Décamps
5d9a2f3df0 am c097bb3d: am 32bb6854: am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar
* commit 'c097bb3d20a2824591a93fc07a6ffef8ddc95fa1':
  minor: remove comment that primaryColor is used for ActionBar
2014-11-02 18:52:52 +00:00
Martin Hibdon
d5bded5864 am 7ac3a295: am 3381416c: am cacf4c53: am 3c2f782c: When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
* commit '7ac3a29506003bdd1229c610a57e04d2c602f51b':
  When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
2014-11-02 18:52:51 +00:00
Martin Hibdon
036d581c8c am 4e91ba99: am a9a341d9: am e9a49c17: am d10ae46e: Merge "Don\'t allow disabling of the camera with managed profiles" into ub-gmail-ur14-dev
* commit '4e91ba99ea874edb91b5178fc3dd3ab36ad3f03a':
  Don't allow disabling of the camera with managed profiles
2014-11-02 18:52:49 +00:00
Rohan Shah
22f8218ccf am 678ca4ba: am 636fed7d: am 33cf634a: am a64435a6: Update colors in Email (ColorRefactor)
* commit '678ca4bad5c7091aa0f22b8e7643734a692d94a5':
  Update colors in Email (ColorRefactor)
2014-11-02 18:52:48 +00:00
Martin Hibdon
639c2f80b8 am 276f275c: am 3c38f6ac: am ef0dc0ac: am 809313bd: Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev
* commit '276f275c542405f7dede5d5258532391fec322ea':
  Add ability to clear migration state to debug screen
2014-11-02 18:52:42 +00:00
Martin Hibdon
ffc9591cfc am a1401e1c: am 1ae6e4d9: am 4e794038: am 123d4028: Make sure to close a cursor
* commit 'a1401e1c87cb6fe339d2709c67c628c4132241e4':
  Make sure to close a cursor
2014-11-02 18:52:41 +00:00
James Lemieux
a94b86e583 am 8a39dd56: am 399e0c3c: am 32152d96: am f1b6b3af: Old paper clip asset is removed, which touches a test case here.
* commit '8a39dd56340050e3fdcb08c2aea806e26362b587':
  Old paper clip asset is removed, which touches a test case here.
2014-11-02 18:52:40 +00:00
Baligh Uddin
4fe3ac93b8 am e6556f74: (-s ours) am 21f273ea: (-s ours) am bdfea7ff: (-s ours) am d54cebe5: (-s ours) Import translations. DO NOT MERGE
* commit 'e6556f74ba3873d6a06bf6fe8ad839a4bda5274c':
  Import translations. DO NOT MERGE
2014-11-02 18:52:39 +00:00
Andrew Sapperstein
672eb2b278 am b3d30510: am a29c6884: am 8fd1a38c: am 9f252e1f: Renaming to support drawer under status bar.
* commit 'b3d305103951106045f524eb76f605558ce9060d':
  Renaming to support drawer under status bar.
2014-11-02 18:52:38 +00:00
Baligh Uddin
0aa4e56ffa am c95fa16f: (-s ours) am 570fce60: (-s ours) am 928bbfef: (-s ours) am fc1ba99a: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit 'c95fa16f362fb56ef06aa415ac96d8d353a10665':
  Import translations. DO NOT MERGE
2014-11-02 18:52:37 +00:00
Martin Hibdon
1a38750f90 am 67a1eec3: am 70f807fb: am 5ae1599a: am 0b693a05: Merge "Fix subfolders of the inbox." into ub-gmail-ur14-dev
* commit '67a1eec311ca0e37d26ed5e8db221de48f488b7c':
  Fix subfolders of the inbox.
2014-11-02 18:52:36 +00:00