Commit Graph

13529 Commits

Author SHA1 Message Date
Martin Hibdon
c0e8417e68 am d77bf0c6: am 764d7b2f: Merge "Disable smart foward/reply" into ub-gmail-ur14-dev
* commit 'd77bf0c6e1ea965f251c7408b77aed868ea80ca7':
  Disable smart foward/reply
2014-11-02 17:30:37 +00:00
Geoff Mendal
968156982e am 34418383: (-s ours) am 98f764fb: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '34418383c50a4979961753086df6e82c9245b5ef':
  Import translations. DO NOT MERGE
2014-11-02 17:30:36 +00:00
Tony Mantler
0f3a01a411 am 14286249: am d716d894: Don\'t assume mHostAuthRecv is loaded when checking outgoing
* commit '142862491526da44250abd5913fa1071772de6da':
  Don't assume mHostAuthRecv is loaded when checking outgoing
2014-11-02 17:30:34 +00:00
Tony Mantler
d82ae435ec am 461d3e74: am 1182e1f9: Merge "Fix handling AOL\'s login rejection" into ub-gmail-ur14-dev
* commit '461d3e749a32a946bfef1ea567dac04fcbaa12b7':
  Fix handling AOL's login rejection
2014-11-02 17:30:33 +00:00
Baligh Uddin
8e9d01c9c3 am 2782b49d: (-s ours) am c2061fb3: (-s ours) Import translations. DO NOT MERGE
* commit '2782b49d5fe797c0df6e94fb8d1f9a4efe386130':
  Import translations. DO NOT MERGE
2014-11-02 17:30:32 +00:00
Régis Décamps
53e49db33a am 955b9f96: am d7192f02: Provider configuration for outlook, yahoo, gmx
* commit '955b9f96107559402a266fa81b98b6e8c90d32ea':
  Provider configuration for outlook, yahoo, gmx
2014-11-02 17:30:31 +00:00
Martin Hibdon
9332c48f56 am 349e6b91: am f61e098a: Correctly update UI_SYNC_STATUS upon search
* commit '349e6b910514f5194702aeac39a448bd155fc929':
  Correctly update UI_SYNC_STATUS upon search
2014-11-02 17:30:30 +00:00
Geoff Mendal
683ceefaa5 am feb9d48a: (-s ours) am 58685874: (-s ours) Import translations. DO NOT MERGE
* commit 'feb9d48a790fcac0ca674ae9a5f6be03ff50df2d':
  Import translations. DO NOT MERGE
2014-11-02 17:30:28 +00:00
Régis Décamps
fad809111c am 4ed38cc1: am 2128e365: Merge "Resend notifications when Accounts are changed" into ub-gmail-ur14-dev
* commit '4ed38cc14c55c36de8d0ca43423d96d521e51465':
  Resend notifications when Accounts are changed
2014-11-02 17:30:27 +00:00
Martin Hibdon
1a10b8f790 am e4a62a76: am 7b44fda9: Merge "Set mailbox uiSyncStatus when IMAP and POP folders are created" into ub-gmail-ur14-dev
* commit 'e4a62a769654d22f31a92167921a2679637ff044':
  Set mailbox uiSyncStatus when IMAP and POP folders are created
2014-11-02 17:30:26 +00:00
Tony Mantler
14c08377e6 am 06e38818: am f9757504: Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev
* commit '06e38818a7a117c5f500d3906b867b353625e398':
  Reload settings immediately after toggling sync
2014-11-02 17:30:25 +00:00
Tony Mantler
6a9a2f43e9 am 433f689c: am 1d929d18: Initial account setup analytics
* commit '433f689cc489d4973b29a058449ad58d48278540':
  Initial account setup analytics
2014-11-02 17:30:24 +00:00
Geoff Mendal
fba6f6f3a1 am 863984a7: (-s ours) am 4012d748: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '863984a7be34df1cbadb7548e84272c0876411c5':
  Import translations. DO NOT MERGE
2014-11-02 17:30:23 +00:00
Rohan Shah
0fd0268871 am d1599a86: am 72f6a243: Revert "Update notification icon asset names (Email)"
* commit 'd1599a86d5e0f1d3ef3e2299466a0dc37949702b':
  Revert "Update notification icon asset names (Email)"
2014-11-02 17:30:22 +00:00
Rohan Shah
56caa6e1c1 am bcbe5794: am cc82965a: Update notification icon asset names (Email)
* commit 'bcbe5794fe4746931ec23be266b4dac31756fd82':
  Update notification icon asset names (Email)
2014-11-02 17:30:20 +00:00
Martin Hibdon
d51891fb4c am 901255ce: am 5fde01e4: Merge "Set the search mailbox\'s syncState as soon as a search is requested" into ub-gmail-ur14-dev
* commit '901255ce4e681cd906945e8a7477fe138de4eb15':
  Set the search mailbox's syncState as soon as a search is requested
2014-11-02 17:30:19 +00:00
Martin Hibdon
f9292376a2 am 8a99e742: am 89272781: EmailProvider now supports query and getType for cached file urls
* commit '8a99e742f5445ea4917515289f4c54f8474dc818':
  EmailProvider now supports query and getType for cached file urls
2014-11-02 17:30:18 +00:00
Tony Mantler
9d3b1a8d0e am 06cc928f: am 1927361b: Merge "Account authentication restyling" into ub-gmail-ur14-dev
* commit '06cc928fd3f1e535153027c9d519a064c7844388':
  Account authentication restyling
2014-11-02 17:30:17 +00:00
Régis Décamps
d606e82521 am f62b6843: am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev
* commit 'f62b684315cdfa06809629ed430206c9eaa3ba0a':
  Replace "Corporate" by "Exchange".
2014-11-02 17:30:16 +00:00
Tony Mantler
815252ad3d am 31966801: am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev
* commit '3196680159dc9752f7b601504dcf0a3b34be23e1':
  Restyle account setup flow nav buttons
2014-11-02 17:30:15 +00:00
Geoff Mendal
f3a519c22b am d7063821: (-s ours) am 2a1daaae: (-s ours) Import translations. DO NOT MERGE
* commit 'd7063821e32bb9fdc9c612c25e439c129a58e6ed':
  Import translations. DO NOT MERGE
2014-11-02 17:30:14 +00:00
Baligh Uddin
8182d3a77d am a3bfe727: (-s ours) am ab3ed2cb: (-s ours) Import translations. DO NOT MERGE
* commit 'a3bfe7271a80803945482ea71dea8a4317ab335b':
  Import translations. DO NOT MERGE
2014-11-02 17:30:13 +00:00
Martin Hibdon
c7d52321bc am 9ef12d1b: am 46f1b89f: Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev
* commit '9ef12d1b01bf6e169c5865af8eb96ffedcfceab4':
  Get SSLSocketFactory from GmsCore
2014-11-02 17:30:12 +00:00
Anthony Lee
468a0417dd am c95714b3: am ec8c2ac9: Merge "Calculate available background threads for AttachmentService correctly." into ub-gmail-ur14-dev
* commit 'c95714b3d8203b055827710e5951f2b65e957da9':
  Calculate available background threads for AttachmentService correctly.
2014-11-02 17:30:10 +00:00
Rohan Shah
80f4af5a15 am cf3aad64: am 42a4f201: Move Email Icons (Email)
* commit 'cf3aad6411d5ca867756c7b504999a740f1ace62':
  Move Email Icons (Email)
2014-11-02 17:30:09 +00:00
Rohan Shah
3884149d7c am a7d316c4: am 083a0138: Merge "Update Email Icons" into ub-gmail-ur14-dev
* commit 'a7d316c40bc0533aa89009a5967b2a60ee0a1d1e':
  Update Email Icons
2014-11-02 17:30:08 +00:00
Rohan Shah
6cef32da6f am a4b5463d: am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev
* commit 'a4b5463df8e17f2f0bfab1e0b76de36201b3f842':
  Revert "Clean-up Email Icons"
2014-11-02 17:30:07 +00:00
Rohan Shah
67df0850e4 am 8a305452: am 6a533823: Merge "Clean-up Email Icons" into ub-gmail-ur14-dev
* commit '8a3054525a1d9ad0e9c63f2d30df0ee50348869e':
  Clean-up Email Icons
2014-11-02 17:30:06 +00:00
Tony Mantler
2ba65aec8c am fa93a71b: am b62067e3: Make sure old body files don\'t contaminate new messages
* commit 'fa93a71b29e4db566f989d7e2c2fea559b83a305':
  Make sure old body files don't contaminate new messages
2014-11-02 17:30:05 +00:00
James Lemieux
c909ad1654 am 826e61c0: am 69ba565b: Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev
* commit '826e61c003e2b2c66865e6b2d62aa0cfa39b5c36':
  Combined view should also display client-side sanitized HTML
2014-11-02 17:30:04 +00:00
James Lemieux
05629b2975 am e811c774: am 40236a89: Display sync errors using snackbar and not as a TL footer
* commit 'e811c77465ebbff11035754139e85444713e2d17':
  Display sync errors using snackbar and not as a TL footer
2014-11-02 17:30:03 +00:00
Baligh Uddin
5edde56b81 am 28a37183: (-s ours) am abd75d1a: (-s ours) Import translations. DO NOT MERGE
* commit '28a37183f0cf3b4716cffd4c39bbf397d5db661c':
  Import translations. DO NOT MERGE
2014-11-02 17:30:02 +00:00
Régis Décamps
32bb6854fa am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar
* commit '1b2a0df1209227e519ca169d001f1a2989e1a713':
  minor: remove comment that primaryColor is used for ActionBar
2014-11-02 17:30:01 +00:00
Martin Hibdon
3381416c55 am cacf4c53: am 3c2f782c: When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
* commit 'cacf4c53de0d619b67ae8c1545c76e8aac10018c':
  When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
2014-11-02 17:29:59 +00:00
Martin Hibdon
a9a341d959 am e9a49c17: am d10ae46e: Merge "Don\'t allow disabling of the camera with managed profiles" into ub-gmail-ur14-dev
* commit 'e9a49c1793e66d6b0eb6484814e6f6d8dcc16dfd':
  Don't allow disabling of the camera with managed profiles
2014-11-02 17:29:58 +00:00
Rohan Shah
636fed7d0b am 33cf634a: am a64435a6: Update colors in Email (ColorRefactor)
* commit '33cf634a6e82e2d1425a5eea927e8ccadaff8ca9':
  Update colors in Email (ColorRefactor)
2014-11-02 17:29:57 +00:00
Martin Hibdon
3c38f6ac95 am ef0dc0ac: am 809313bd: Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev
* commit 'ef0dc0ac016776c704ccd5ea9805b610664bc46f':
  Add ability to clear migration state to debug screen
2014-11-02 17:29:55 +00:00
Martin Hibdon
1ae6e4d9da am 4e794038: am 123d4028: Make sure to close a cursor
* commit '4e79403856af4fcfeb926856edb58a11cd9781c1':
  Make sure to close a cursor
2014-11-02 17:29:54 +00:00
James Lemieux
399e0c3cf7 am 32152d96: am f1b6b3af: Old paper clip asset is removed, which touches a test case here.
* commit '32152d96e5ba4233acfa17644738428c9a9e0c82':
  Old paper clip asset is removed, which touches a test case here.
2014-11-02 17:29:53 +00:00
Baligh Uddin
21f273ea8b am bdfea7ff: (-s ours) am d54cebe5: (-s ours) Import translations. DO NOT MERGE
* commit 'bdfea7ffd06f511d969d3b6a4bacc479dd9f683c':
  Import translations. DO NOT MERGE
2014-11-02 17:29:51 +00:00
Andrew Sapperstein
a29c688439 am 8fd1a38c: am 9f252e1f: Renaming to support drawer under status bar.
* commit '8fd1a38c6af1f3622dd55aa709ff61a9478c0f17':
  Renaming to support drawer under status bar.
2014-11-02 17:29:50 +00:00
Baligh Uddin
570fce6068 am 928bbfef: (-s ours) am fc1ba99a: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '928bbfeff210756348b38c7fd709e1dbd5699b05':
  Import translations. DO NOT MERGE
2014-11-02 17:29:49 +00:00
Martin Hibdon
70f807fb64 am 5ae1599a: am 0b693a05: Merge "Fix subfolders of the inbox." into ub-gmail-ur14-dev
* commit '5ae1599a839e6dd2298f97740707b7f435acacd0':
  Fix subfolders of the inbox.
2014-11-02 17:29:47 +00:00
Paul Westbrook
55e10293a8 am dcaf7988: am 7f32e9c6: Prevent AccountSettingsFragment from being stripped
* commit 'dcaf7988bd1e22adeac275ca7bea345185dd3868':
  Prevent AccountSettingsFragment from being stripped
2014-11-02 17:29:46 +00:00
Paul Westbrook
954b358a26 am 26f193da: am bb68c13a: Changes to support smaller email tombstone apk size
* commit '26f193dab5a38a50d111c443b210838b5a62411b':
  Changes to support smaller email tombstone apk size
2014-11-02 17:29:45 +00:00
Andrew Sapperstein
625bc3c04e am 6bf29750: am 88929fd2: Switch to targetSdkVersion=21. b/16408109
* commit '6bf29750697bfd33bc1015631d8ba0ce6cf3f339':
  Switch to targetSdkVersion=21. b/16408109
2014-11-02 17:29:44 +00:00
Baligh Uddin
45f0c596e8 am 503f4638: (-s ours) am 3b47856d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '503f46388d8522d22b4116c8b87a346b2ac18d15':
  Import translations. DO NOT MERGE
2014-11-02 17:29:43 +00:00
Baligh Uddin
1b24aa0265 am 99cf59cb: (-s ours) am ff83aff9: (-s ours) am e421a5e1: (-s ours) Import translations. DO NOT MERGE
* commit '99cf59cbf492e7f6b14a3dbe0c43be63850a85f1':
  Import translations. DO NOT MERGE
2014-11-02 17:29:42 +00:00
Martin Hibdon
416f921021 am 13666c7f: am 8209d6c0: Display a warning if account is on security hold
* commit '13666c7f92aa6e52e0200663af7c1db18cfb618f':
  Display a warning if account is on security hold
2014-11-02 17:29:41 +00:00
Rohan Shah
505d411dfa am 8645bd80: am 58d7f7b2: Merge "Tag Notifications with People (Email)" into ub-gmail-ur14-dev
* commit '8645bd80496f94c5a8b60fd54efeab577aab1e5c':
  Tag Notifications with People (Email)
2014-11-02 17:29:40 +00:00