Commit Graph

  • 774ab0e296 am 5249a10e: am 200adbe9: am 14c08377: am 06e38818: am f9757504: Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 19:03:09 +0000
  • f6524f4c80 am bd9add46: am 22d25e37: am 6a9a2f43: am 433f689c: am 1d929d18: Initial account setup analytics Tony Mantler 2014-11-02 19:03:08 +0000
  • 1090cd2e69 am 107cacf5: (-s ours) 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 Geoff Mendal 2014-11-02 19:03:07 +0000
  • 65658de392 am 94409eea: am 56fd0d48: am 0fd02688: am d1599a86: am 72f6a243: Revert "Update notification icon asset names (Email)" Rohan Shah 2014-11-02 19:03:06 +0000
  • eed3e23f39 am 9e15a653: am c33016dc: am 56caa6e1: am bcbe5794: am cc82965a: Update notification icon asset names (Email) Rohan Shah 2014-11-02 19:03:05 +0000
  • ade1ee601a am f120e97a: 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 Martin Hibdon 2014-11-02 19:03:04 +0000
  • 40899215fe am 562f5c96: am 62318ee6: am f9292376: am 8a99e742: am 89272781: EmailProvider now supports query and getType for cached file urls Martin Hibdon 2014-11-02 19:03:03 +0000
  • 8d046b0a80 am 09897615: am 92532b1c: am 9d3b1a8d: am 06cc928f: am 1927361b: Merge "Account authentication restyling" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 19:03:01 +0000
  • 2a97b79384 am 66af7782: am f24a5de9: am d606e825: am f62b6843: am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev Régis Décamps 2014-11-02 19:03:00 +0000
  • c8fee48f2e am 18e8b55b: am 2b39de91: am 815252ad: am 31966801: am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 19:02:59 +0000
  • bf49effb1e am b64e1d26: (-s ours) am 813b5b9d: (-s ours) am f3a519c2: (-s ours) am d7063821: (-s ours) am 2a1daaae: (-s ours) Import translations. DO NOT MERGE Geoff Mendal 2014-11-02 19:02:57 +0000
  • c0a920feab am a4ec3b63: (-s ours) am 037c4356: (-s ours) am 8182d3a7: (-s ours) am a3bfe727: (-s ours) am ab3ed2cb: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 19:02:56 +0000
  • f027de693e am f44db892: am b8209a4c: am c7d52321: am 9ef12d1b: am 46f1b89f: Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 19:02:54 +0000
  • b3eca7880c am 51710a73: am 82319a98: am 468a0417: am c95714b3: am ec8c2ac9: Merge "Calculate available background threads for AttachmentService correctly." into ub-gmail-ur14-dev Anthony Lee 2014-11-02 19:02:53 +0000
  • e9a520f9ef am e1c103dc: am 93a6c2c3: am 80f4af5a: am cf3aad64: am 42a4f201: Move Email Icons (Email) Rohan Shah 2014-11-02 19:02:51 +0000
  • 7e40de1bcc am 7073065d: am 2df883ac: am 3884149d: am a7d316c4: am 083a0138: Merge "Update Email Icons" into ub-gmail-ur14-dev Rohan Shah 2014-11-02 19:02:50 +0000
  • 45af012ad3 am 0114c401: am 9486b751: am 6cef32da: am a4b5463d: am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev Rohan Shah 2014-11-02 19:02:48 +0000
  • d14760b69b am e57e10a4: am d2ad0933: am 67df0850: am 8a305452: am 6a533823: Merge "Clean-up Email Icons" into ub-gmail-ur14-dev Rohan Shah 2014-11-02 19:02:47 +0000
  • 0c39ba15f9 am 0c6747a6: am 941d0a46: am 2ba65aec: am fa93a71b: am b62067e3: Make sure old body files don\'t contaminate new messages Tony Mantler 2014-11-02 19:02:45 +0000
  • 91d415ef4c am f247d7e0: am 417c1ded: am c909ad16: am 826e61c0: am 69ba565b: Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev James Lemieux 2014-11-02 19:02:44 +0000
  • c8c3c7105e am bb8efd35: am ab841bb5: am 05629b29: am e811c774: am 40236a89: Display sync errors using snackbar and not as a TL footer James Lemieux 2014-11-02 19:02:42 +0000
  • 82a6c51779 am 9d6bb2cf: (-s ours) am a8fee47f: (-s ours) am 5edde56b: (-s ours) am 28a37183: (-s ours) am abd75d1a: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 19:02:40 +0000
  • 9fec8062d5 am 5d9a2f3d: am c097bb3d: am 32bb6854: am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar Régis Décamps 2014-11-02 19:02:38 +0000
  • 2e4a3dbfae am d5bded58: am 7ac3a295: am 3381416c: am cacf4c53: am 3c2f782c: When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED Martin Hibdon 2014-11-02 19:02:36 +0000
  • 6ebe3a6ea2 am 036d581c: am 4e91ba99: am a9a341d9: am e9a49c17: am d10ae46e: Merge "Don\'t allow disabling of the camera with managed profiles" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 19:02:34 +0000
  • bad4e4694e am 22f8218c: am 678ca4ba: am 636fed7d: am 33cf634a: am a64435a6: Update colors in Email (ColorRefactor) Rohan Shah 2014-11-02 19:02:33 +0000
  • 205845e61d am 639c2f80: am 276f275c: am 3c38f6ac: am ef0dc0ac: am 809313bd: Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 19:02:31 +0000
  • f214c7effe am ffc9591c: am a1401e1c: am 1ae6e4d9: am 4e794038: am 123d4028: Make sure to close a cursor Martin Hibdon 2014-11-02 19:02:29 +0000
  • 1286b3fc3d am a94b86e5: am 8a39dd56: am 399e0c3c: am 32152d96: am f1b6b3af: Old paper clip asset is removed, which touches a test case here. James Lemieux 2014-11-02 19:02:28 +0000
  • dee5bbb6df am 4fe3ac93: (-s ours) am e6556f74: (-s ours) am 21f273ea: (-s ours) am bdfea7ff: (-s ours) am d54cebe5: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 19:02:26 +0000
  • 6c0795a3e5 am 672eb2b2: am b3d30510: am a29c6884: am 8fd1a38c: am 9f252e1f: Renaming to support drawer under status bar. Andrew Sapperstein 2014-11-02 19:02:25 +0000
  • 0b477c5035 am 0aa4e56f: (-s ours) 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 Baligh Uddin 2014-11-02 19:02:23 +0000
  • 5eb19a6d6d am 1a38750f: am 67a1eec3: am 70f807fb: am 5ae1599a: am 0b693a05: Merge "Fix subfolders of the inbox." into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 19:02:21 +0000
  • 6ce676a212 am 74055e85: am 7bee86e7: am 55e10293: am dcaf7988: am 7f32e9c6: Prevent AccountSettingsFragment from being stripped Paul Westbrook 2014-11-02 19:02:20 +0000
  • cc8f214ccd am 5080a3ad: am 6a62de22: am 954b358a: am 26f193da: am bb68c13a: Changes to support smaller email tombstone apk size Paul Westbrook 2014-11-02 19:02:18 +0000
  • 18a3b7a387 am 38b299b8: am e2ab82c8: am 625bc3c0: am 6bf29750: am 88929fd2: Switch to targetSdkVersion=21. b/16408109 Andrew Sapperstein 2014-11-02 19:02:16 +0000
  • f7e0570bc3 am 9cb90c3a: (-s ours) am b96905a8: (-s ours) am 45f0c596: (-s ours) am 503f4638: (-s ours) am 3b47856d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev Baligh Uddin 2014-11-02 19:02:14 +0000
  • b665c798e2 am 903a81df: (-s ours) am 7bf320a7: (-s ours) am 1b24aa02: (-s ours) am 99cf59cb: (-s ours) am ff83aff9: (-s ours) am e421a5e1: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 19:02:12 +0000
  • 6702177e81 am 0df19789: am 47288061: am 416f9210: am 13666c7f: am 8209d6c0: Display a warning if account is on security hold Martin Hibdon 2014-11-02 19:02:10 +0000
  • 2ca7643f4d am 13ced23c: am f8ae0f7b: am 505d411d: am 8645bd80: am 58d7f7b2: Merge "Tag Notifications with People (Email)" into ub-gmail-ur14-dev Rohan Shah 2014-11-02 19:02:08 +0000
  • 5b93ef6df1 am a6446151: am 93d419dd: am 40feb8f9: am 65d130ad: am b3be4655: Merge "Sync account immediately upon restore" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 19:02:06 +0000
  • 26859ae360 am 008d5501: am a78ba75e: am f44d334f: am ebfa64a7: am ce6e2de7: Merge "Use correct password dialog for outgoing settings" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 19:02:04 +0000
  • 9115a12218 am eaafa9a9: am 22538106: am d8800386: am 2d3730b5: am cb45d6fa: Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 19:02:02 +0000
  • e7c34de30c am e27ea4a2: (-s ours) am 85313f47: (-s ours) am abc613bf: (-s ours) am dc956891: (-s ours) am efca9af6: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev Baligh Uddin 2014-11-02 19:01:59 +0000
  • dd5a7dad81 am 0fa53a33: am 99219eb0: am 86dda976: am a79eed71: am c6d5ec49: No more big yellow envelope Tony Mantler 2014-11-02 19:01:57 +0000
  • a54d0838b7 resolved conflicts for merge of 6666fbf0 to master Paul Westbrook 2014-11-02 11:00:40 -0800
  • ded6357d8a am 4301e602: (-s ours) am 268485ff: (-s ours) am b188964b: (-s ours) am 96ade4e2: (-s ours) Import translations. DO NOT MERGE Geoff Mendal 2014-11-02 18:53:49 +0000
  • 12a5933af3 am aee74ef4: am f495b95d: am 67b60f66: am b57bca27: Default to encrypted connections (YAY!) Tony Mantler 2014-11-02 18:53:48 +0000
  • 6efb1c66d0 am 7c74d82b: am ab743fb5: am 0f6acb54: am f0bbcd85: Add additional analytics regarding our SSLSockets Martin Hibdon 2014-11-02 18:53:47 +0000
  • 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 Martin Hibdon 2014-11-02 18:53:46 +0000
  • 6b1f582457 am 94190da3: am dc6f3aaf: am 85d0fdbe: am 303b553b: Allow an external security provider to be installed Martin Hibdon 2014-11-02 18:53:43 +0000
  • 78f4dcb52b am 04b77626: am a67e2212: am be216a96: am a908d45a: Merge "Add deprecated cipher suites to our SSLSocket" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 18:53:42 +0000
  • 4018b9cc9e am cadbc47f: am 4827f0bc: am f85d9e08: am 9d73facf: Merge "Fix restoreBodySource key so it returns the correct value." into ub-gmail-ur14-dev Anthony Lee 2014-11-02 18:53:40 +0000
  • 4d587d6c73 am dedad5cc: am c0e8417e: am d77bf0c6: am 764d7b2f: Merge "Disable smart foward/reply" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 18:53:39 +0000
  • 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 Geoff Mendal 2014-11-02 18:53:38 +0000
  • 64bbe34de9 am 12866ff1: am 0f3a01a4: am 14286249: am d716d894: Don\'t assume mHostAuthRecv is loaded when checking outgoing Tony Mantler 2014-11-02 18:53:37 +0000
  • 35ffcc3a0b am bf98b875: am d82ae435: am 461d3e74: am 1182e1f9: Merge "Fix handling AOL\'s login rejection" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 18:53:36 +0000
  • 78d1614ec4 am 38a40ba6: (-s ours) am 8e9d01c9: (-s ours) am 2782b49d: (-s ours) am c2061fb3: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 18:53:35 +0000
  • 98ceb1d9ca am b6785995: am 53e49db3: am 955b9f96: am d7192f02: Provider configuration for outlook, yahoo, gmx Régis Décamps 2014-11-02 18:53:33 +0000
  • 40b9f3c7df am f0987d36: am 9332c48f: am 349e6b91: am f61e098a: Correctly update UI_SYNC_STATUS upon search Martin Hibdon 2014-11-02 18:53:32 +0000
  • b4c0eba750 am fe58e8e0: (-s ours) am 683ceefa: (-s ours) am feb9d48a: (-s ours) am 58685874: (-s ours) Import translations. DO NOT MERGE Geoff Mendal 2014-11-02 18:53:31 +0000
  • 81d5ed1f10 am b5e2358f: am fad80911: am 4ed38cc1: am 2128e365: Merge "Resend notifications when Accounts are changed" into ub-gmail-ur14-dev Régis Décamps 2014-11-02 18:53:30 +0000
  • 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 Martin Hibdon 2014-11-02 18:53:29 +0000
  • 5249a10e8c am 200adbe9: am 14c08377: am 06e38818: am f9757504: Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 18:53:28 +0000
  • bd9add46f6 am 22d25e37: am 6a9a2f43: am 433f689c: am 1d929d18: Initial account setup analytics Tony Mantler 2014-11-02 18:53:26 +0000
  • 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 Geoff Mendal 2014-11-02 18:53:25 +0000
  • 94409eea47 am 56fd0d48: am 0fd02688: am d1599a86: am 72f6a243: Revert "Update notification icon asset names (Email)" Rohan Shah 2014-11-02 18:53:24 +0000
  • 9e15a6537e am c33016dc: am 56caa6e1: am bcbe5794: am cc82965a: Update notification icon asset names (Email) Rohan Shah 2014-11-02 18:53:23 +0000
  • 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 Martin Hibdon 2014-11-02 18:53:12 +0000
  • 562f5c9609 am 62318ee6: am f9292376: am 8a99e742: am 89272781: EmailProvider now supports query and getType for cached file urls Martin Hibdon 2014-11-02 18:53:11 +0000
  • 0989761529 am 92532b1c: am 9d3b1a8d: am 06cc928f: am 1927361b: Merge "Account authentication restyling" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 18:53:10 +0000
  • 66af7782fe am f24a5de9: am d606e825: am f62b6843: am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev Régis Décamps 2014-11-02 18:53:09 +0000
  • 18e8b55b75 am 2b39de91: am 815252ad: am 31966801: am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 18:53:07 +0000
  • b64e1d2668 am 813b5b9d: (-s ours) am f3a519c2: (-s ours) am d7063821: (-s ours) am 2a1daaae: (-s ours) Import translations. DO NOT MERGE Geoff Mendal 2014-11-02 18:53:06 +0000
  • a4ec3b6348 am 037c4356: (-s ours) am 8182d3a7: (-s ours) am a3bfe727: (-s ours) am ab3ed2cb: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 18:53:05 +0000
  • f44db892ec am b8209a4c: am c7d52321: am 9ef12d1b: am 46f1b89f: Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 18:53:03 +0000
  • 51710a73cd am 82319a98: am 468a0417: am c95714b3: am ec8c2ac9: Merge "Calculate available background threads for AttachmentService correctly." into ub-gmail-ur14-dev Anthony Lee 2014-11-02 18:53:02 +0000
  • e1c103dc6e am 93a6c2c3: am 80f4af5a: am cf3aad64: am 42a4f201: Move Email Icons (Email) Rohan Shah 2014-11-02 18:53:01 +0000
  • 7073065d34 am 2df883ac: am 3884149d: am a7d316c4: am 083a0138: Merge "Update Email Icons" into ub-gmail-ur14-dev Rohan Shah 2014-11-02 18:53:00 +0000
  • 0114c4017f am 9486b751: am 6cef32da: am a4b5463d: am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev Rohan Shah 2014-11-02 18:52:59 +0000
  • e57e10a434 am d2ad0933: am 67df0850: am 8a305452: am 6a533823: Merge "Clean-up Email Icons" into ub-gmail-ur14-dev Rohan Shah 2014-11-02 18:52:57 +0000
  • 0c6747a60d am 941d0a46: am 2ba65aec: am fa93a71b: am b62067e3: Make sure old body files don\'t contaminate new messages Tony Mantler 2014-11-02 18:52:56 +0000
  • f247d7e02e am 417c1ded: am c909ad16: am 826e61c0: am 69ba565b: Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev James Lemieux 2014-11-02 18:52:55 +0000
  • bb8efd3583 am ab841bb5: am 05629b29: am e811c774: am 40236a89: Display sync errors using snackbar and not as a TL footer James Lemieux 2014-11-02 18:52:54 +0000
  • 9d6bb2cf84 am a8fee47f: (-s ours) am 5edde56b: (-s ours) am 28a37183: (-s ours) am abd75d1a: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 18:52:53 +0000
  • 5d9a2f3df0 am c097bb3d: am 32bb6854: am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar Régis Décamps 2014-11-02 18:52:52 +0000
  • d5bded5864 am 7ac3a295: am 3381416c: am cacf4c53: am 3c2f782c: When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED Martin Hibdon 2014-11-02 18:52:51 +0000
  • 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 Martin Hibdon 2014-11-02 18:52:49 +0000
  • 22f8218ccf am 678ca4ba: am 636fed7d: am 33cf634a: am a64435a6: Update colors in Email (ColorRefactor) Rohan Shah 2014-11-02 18:52:48 +0000
  • 639c2f80b8 am 276f275c: am 3c38f6ac: am ef0dc0ac: am 809313bd: Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 18:52:42 +0000
  • ffc9591cfc am a1401e1c: am 1ae6e4d9: am 4e794038: am 123d4028: Make sure to close a cursor Martin Hibdon 2014-11-02 18:52:41 +0000
  • a94b86e583 am 8a39dd56: am 399e0c3c: am 32152d96: am f1b6b3af: Old paper clip asset is removed, which touches a test case here. James Lemieux 2014-11-02 18:52:40 +0000
  • 4fe3ac93b8 am e6556f74: (-s ours) am 21f273ea: (-s ours) am bdfea7ff: (-s ours) am d54cebe5: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 18:52:39 +0000
  • 672eb2b278 am b3d30510: am a29c6884: am 8fd1a38c: am 9f252e1f: Renaming to support drawer under status bar. Andrew Sapperstein 2014-11-02 18:52:38 +0000
  • 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 Baligh Uddin 2014-11-02 18:52:37 +0000
  • 1a38750f90 am 67a1eec3: am 70f807fb: am 5ae1599a: am 0b693a05: Merge "Fix subfolders of the inbox." into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 18:52:36 +0000
  • 74055e85a7 am 7bee86e7: am 55e10293: am dcaf7988: am 7f32e9c6: Prevent AccountSettingsFragment from being stripped Paul Westbrook 2014-11-02 18:52:35 +0000
  • 5080a3adbf am 6a62de22: am 954b358a: am 26f193da: am bb68c13a: Changes to support smaller email tombstone apk size Paul Westbrook 2014-11-02 18:52:34 +0000
  • 38b299b8dd am e2ab82c8: am 625bc3c0: am 6bf29750: am 88929fd2: Switch to targetSdkVersion=21. b/16408109 Andrew Sapperstein 2014-11-02 18:52:33 +0000
  • 9cb90c3a60 am b96905a8: (-s ours) am 45f0c596: (-s ours) am 503f4638: (-s ours) am 3b47856d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev Baligh Uddin 2014-11-02 18:52:32 +0000