ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,461 Commits 2 Branches 0 Tags 45 MiB
Commit Graph

13461 Commits

Author SHA1 Message Date
Paul Westbrook 1c0662f998 fix bad merge 
Change-Id: I3cb09668bbb629237edbe683b11bbad13aabfe92
 2014-11-02 12:43:08 -08:00
Paul Westbrook 47ee463729 resolved conflicts for merge of 19809304 to lmp-sprout-dev 
Change-Id: Idf62af52625ad5c5a5b99d9f0067d49e9128b5e9
 2014-11-02 10:33:04 -08:00
Geoff Mendal b188964b16 am 96ade4e2: (-s ours) Import translations. DO NOT MERGE 
* commit '96ade4e2a42c711e645547e6ff805d3f4a923cf5':
  Import translations. DO NOT MERGE
 2014-11-02 15:33:56 +00:00
Tony Mantler 67b60f66a8 am b57bca27: Default to encrypted connections (YAY!) 
* commit 'b57bca2734ba5154c6aa01e69b6ed10fc0ac1989':
  Default to encrypted connections (YAY!)
 2014-11-02 15:33:55 +00:00
Martin Hibdon 0f6acb548b am f0bbcd85: Add additional analytics regarding our SSLSockets 
* commit 'f0bbcd85eaba6624d4c52150e83930e816d873a4':
  Add additional analytics regarding our SSLSockets
 2014-11-02 15:33:53 +00:00
Martin Hibdon 0e1bdee9ac am 21dc44d2: Merge "Add analytics to track of what cipher suites are being used" into ub-gmail-ur14-dev 
* commit '21dc44d235d902fa9eea0b3ce2c4bc5140fd8ba8':
  Add analytics to track of what cipher suites are being used
 2014-11-02 15:33:52 +00:00
Martin Hibdon 85d0fdbe8f am 303b553b: Allow an external security provider to be installed 
* commit '303b553b13a02529fc8cb22b9b37672887759ce9':
  Allow an external security provider to be installed
 2014-11-02 15:33:51 +00:00
Martin Hibdon be216a96db am a908d45a: Merge "Add deprecated cipher suites to our SSLSocket" into ub-gmail-ur14-dev 
* commit 'a908d45ae3519ecdc82e187d1ab72e8991ea7ed8':
  Add deprecated cipher suites to our SSLSocket
 2014-11-02 15:33:50 +00:00
Anthony Lee f85d9e0835 am 9d73facf: Merge "Fix restoreBodySource key so it returns the correct value." into ub-gmail-ur14-dev 
* commit '9d73facfa8c1c16e2443bf26778ad70d17efc350':
  Fix restoreBodySource key so it returns the correct value.
 2014-11-02 15:33:49 +00:00
Martin Hibdon d77bf0c6e1 am 764d7b2f: Merge "Disable smart foward/reply" into ub-gmail-ur14-dev 
* commit '764d7b2f660cf22ded3ec290ae716bf806abe489':
  Disable smart foward/reply
 2014-11-02 15:33:48 +00:00
Geoff Mendal 34418383c5 am 98f764fb: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev 
* commit '98f764fb726b07dbbb20fdd31f5b0377be627269':
  Import translations. DO NOT MERGE
 2014-11-02 15:33:46 +00:00
Tony Mantler 1428624915 am d716d894: Don\'t assume mHostAuthRecv is loaded when checking outgoing 
* commit 'd716d89459f736402e74f3cfb2f20a71e50768f0':
  Don't assume mHostAuthRecv is loaded when checking outgoing
 2014-11-02 15:33:39 +00:00
Tony Mantler 461d3e749a am 1182e1f9: Merge "Fix handling AOL\'s login rejection" into ub-gmail-ur14-dev 
* commit '1182e1f9326b34291598ea3c2329a2d782631e49':
  Fix handling AOL's login rejection
 2014-11-02 15:33:38 +00:00
Baligh Uddin 2782b49d5f am c2061fb3: (-s ours) Import translations. DO NOT MERGE 
* commit 'c2061fb34a7e5af1dda5fe0ce6fa79b98f805a2c':
  Import translations. DO NOT MERGE
 2014-11-02 15:33:36 +00:00
Régis Décamps 955b9f9610 am d7192f02: Provider configuration for outlook, yahoo, gmx 
* commit 'd7192f0213d6468084c1e18d73ee3cb8c6387b61':
  Provider configuration for outlook, yahoo, gmx
 2014-11-02 15:33:35 +00:00
Martin Hibdon 349e6b9105 am f61e098a: Correctly update UI_SYNC_STATUS upon search 
* commit 'f61e098a4161dd52f1d81c577520ce96b617480d':
  Correctly update UI_SYNC_STATUS upon search
 2014-11-02 15:33:34 +00:00
Geoff Mendal feb9d48a79 am 58685874: (-s ours) Import translations. DO NOT MERGE 
* commit '586858745faf17e95a1fa22e19621aafe365eb5c':
  Import translations. DO NOT MERGE
 2014-11-02 15:33:32 +00:00
Régis Décamps 4ed38cc14c am 2128e365: Merge "Resend notifications when Accounts are changed" into ub-gmail-ur14-dev 
* commit '2128e36569126fb9c04f77f42c021d11e4becd96':
  Resend notifications when Accounts are changed
 2014-11-02 15:33:31 +00:00
Martin Hibdon e4a62a7696 am 7b44fda9: Merge "Set mailbox uiSyncStatus when IMAP and POP folders are created" into ub-gmail-ur14-dev 
* commit '7b44fda91e7b9729826dce7e72c97defaa158a84':
  Set mailbox uiSyncStatus when IMAP and POP folders are created
 2014-11-02 15:33:30 +00:00
Tony Mantler 06e38818a7 am f9757504: Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev 
* commit 'f9757504b605942bcf1331ed98d211b1aa87dd0d':
  Reload settings immediately after toggling sync
 2014-11-02 15:33:29 +00:00
Tony Mantler 433f689cc4 am 1d929d18: Initial account setup analytics 
* commit '1d929d18fe322003961599dc1b8efbe7547c4c14':
  Initial account setup analytics
 2014-11-02 15:33:28 +00:00
Geoff Mendal 863984a7be am 4012d748: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev 
* commit '4012d74867772c0f915c3989254495d1bdea4a64':
  Import translations. DO NOT MERGE
 2014-11-02 15:33:26 +00:00
Rohan Shah d1599a86d5 am 72f6a243: Revert "Update notification icon asset names (Email)" 
* commit '72f6a2432ed3ca183e2311ffaa2f7fa87f3df915':
  Revert "Update notification icon asset names (Email)"
 2014-11-02 15:33:25 +00:00
Rohan Shah bcbe5794fe am cc82965a: Update notification icon asset names (Email) 
* commit 'cc82965ac9a84d65c2e8e1152bd8f9929d5674cb':
  Update notification icon asset names (Email)
 2014-11-02 15:33:24 +00:00
Martin Hibdon 901255ce4e am 5fde01e4: Merge "Set the search mailbox\'s syncState as soon as a search is requested" into ub-gmail-ur14-dev 
* commit '5fde01e4a94b0339937da3bf927031dbc3d631dd':
  Set the search mailbox's syncState as soon as a search is requested
 2014-11-02 15:33:23 +00:00
Martin Hibdon 8a99e742f5 am 89272781: EmailProvider now supports query and getType for cached file urls 
* commit '89272781fa854e7f44e673bbc3d9c87b0a7b44b4':
  EmailProvider now supports query and getType for cached file urls
 2014-11-02 15:33:21 +00:00
Tony Mantler 06cc928fd3 am 1927361b: Merge "Account authentication restyling" into ub-gmail-ur14-dev 
* commit '1927361b258b347c6afa457a4cd122f4fb131027':
  Account authentication restyling
 2014-11-02 15:33:20 +00:00
Régis Décamps f62b684315 am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev 
* commit '8c0253a1f0d2ee064b183c9055bd4b80dfcf4333':
  Replace "Corporate" by "Exchange".
 2014-11-02 15:33:19 +00:00
Tony Mantler 3196680159 am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev 
* commit '746dcf06db03e99156d77b066f4814d80e2e2fd6':
  Restyle account setup flow nav buttons
 2014-11-02 15:33:17 +00:00
Geoff Mendal d7063821e3 am 2a1daaae: (-s ours) Import translations. DO NOT MERGE 
* commit '2a1daaae4db44ade63d68baec82af46b50b52555':
  Import translations. DO NOT MERGE
 2014-11-02 15:33:16 +00:00
Baligh Uddin a3bfe7271a am ab3ed2cb: (-s ours) Import translations. DO NOT MERGE 
* commit 'ab3ed2cb7ac10a90d3bc9d4bc95f209c2de20d5a':
  Import translations. DO NOT MERGE
 2014-11-02 15:33:15 +00:00
Martin Hibdon 9ef12d1b01 am 46f1b89f: Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev 
* commit '46f1b89fefc4b8d98b3a9bcc54ff71fae6af9c61':
  Get SSLSocketFactory from GmsCore
 2014-11-02 15:33:09 +00:00
Anthony Lee c95714b3d8 am ec8c2ac9: Merge "Calculate available background threads for AttachmentService correctly." into ub-gmail-ur14-dev 
* commit 'ec8c2ac9dff2a60d2ac30ff292102477d9809355':
  Calculate available background threads for AttachmentService correctly.
 2014-11-02 15:33:08 +00:00
Rohan Shah cf3aad6411 am 42a4f201: Move Email Icons (Email) 
* commit '42a4f201201e60cec049847aed9a0e587a793f9e':
  Move Email Icons (Email)
 2014-11-02 15:33:07 +00:00
Rohan Shah a7d316c40b am 083a0138: Merge "Update Email Icons" into ub-gmail-ur14-dev 
* commit '083a01382678e4843c3f9b07b2586477a3303484':
  Update Email Icons
 2014-11-02 15:33:06 +00:00
Rohan Shah a4b5463df8 am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev 
* commit '36830d42f895cc7fc925298245422e97d4e1a6c5':
  Revert "Clean-up Email Icons"
 2014-11-02 15:33:04 +00:00
Rohan Shah 8a3054525a am 6a533823: Merge "Clean-up Email Icons" into ub-gmail-ur14-dev 
* commit '6a533823f35a555d09ea0a6cc1aca79b7ec6b853':
  Clean-up Email Icons
 2014-11-02 15:33:03 +00:00
Tony Mantler fa93a71b29 am b62067e3: Make sure old body files don\'t contaminate new messages 
* commit 'b62067e3c3ec01559568705df4908fe7f2860af9':
  Make sure old body files don't contaminate new messages
 2014-11-02 15:33:02 +00:00
James Lemieux 826e61c003 am 69ba565b: Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev 
* commit '69ba565b62874d4957c28749494bef173490b0c1':
  Combined view should also display client-side sanitized HTML
 2014-11-02 15:33:00 +00:00
James Lemieux e811c77465 am 40236a89: Display sync errors using snackbar and not as a TL footer 
* commit '40236a89316ab2151a8c93de0e286c2f1a9a8d37':
  Display sync errors using snackbar and not as a TL footer
 2014-11-02 15:32:59 +00:00
Baligh Uddin 28a37183f0 am abd75d1a: (-s ours) Import translations. DO NOT MERGE 
* commit 'abd75d1adb299237def0d5f072a186fefea77459':
  Import translations. DO NOT MERGE
 2014-11-02 15:32:58 +00:00
Régis Décamps 1b2a0df120 am f99328b0: minor: remove comment that primaryColor is used for ActionBar 
* commit 'f99328b07c7191ffd53e682d9c624bf9cdb80c16':
  minor: remove comment that primaryColor is used for ActionBar
 2014-11-02 15:32:57 +00:00
Martin Hibdon cacf4c53de am 3c2f782c: When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED 
* commit '3c2f782c357807befa9b9416ccdf0b15d5a316ab':
  When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
 2014-11-02 15:32:56 +00:00
Martin Hibdon e9a49c1793 am d10ae46e: Merge "Don\'t allow disabling of the camera with managed profiles" into ub-gmail-ur14-dev 
* commit 'd10ae46e607570d0c860438d21f2d8f33a7cbf72':
  Don't allow disabling of the camera with managed profiles
 2014-11-02 15:32:55 +00:00
Rohan Shah 33cf634a6e am a64435a6: Update colors in Email (ColorRefactor) 
* commit 'a64435a62f903ad865b97d750e5aa84d045fc7c4':
  Update colors in Email (ColorRefactor)
 2014-11-02 15:32:53 +00:00
Martin Hibdon ef0dc0ac01 am 809313bd: Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev 
* commit '809313bda69d429b72a11c1d030907405533ec08':
  Add ability to clear migration state to debug screen
 2014-11-02 15:32:52 +00:00
Martin Hibdon 4e79403856 am 123d4028: Make sure to close a cursor 
* commit '123d40283e1411dcb5fa5def656ad352c101e5d0':
  Make sure to close a cursor
 2014-11-02 15:32:50 +00:00
James Lemieux 32152d96e5 am f1b6b3af: Old paper clip asset is removed, which touches a test case here. 
* commit 'f1b6b3afd97a372ec8492ac97fa5fb49c692da6e':
  Old paper clip asset is removed, which touches a test case here.
 2014-11-02 15:32:49 +00:00
Baligh Uddin bdfea7ffd0 am d54cebe5: (-s ours) Import translations. DO NOT MERGE 
* commit 'd54cebe5ec0e0b0c0ab935fc281f1662a69e38f2':
  Import translations. DO NOT MERGE
 2014-11-02 15:32:48 +00:00
Andrew Sapperstein 8fd1a38c6a am 9f252e1f: Renaming to support drawer under status bar. 
* commit '9f252e1f546446d7d6f8567a2cdbb81aa8c2b185':
  Renaming to support drawer under status bar.
 2014-11-02 15:32:47 +00:00