Commit Graph

  • d2ad093397 am 67df0850: am 8a305452: am 6a533823: Merge "Clean-up Email Icons" into ub-gmail-ur14-dev Rohan Shah 2014-11-02 17:37:46 +0000
  • 941d0a4661 am 2ba65aec: am fa93a71b: am b62067e3: Make sure old body files don\'t contaminate new messages Tony Mantler 2014-11-02 17:37:45 +0000
  • 417c1deda2 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 17:37:44 +0000
  • ab841bb554 am 05629b29: am e811c774: am 40236a89: Display sync errors using snackbar and not as a TL footer James Lemieux 2014-11-02 17:37:43 +0000
  • a8fee47f76 am 5edde56b: (-s ours) am 28a37183: (-s ours) am abd75d1a: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 17:37:42 +0000
  • c097bb3d20 am 32bb6854: am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar Régis Décamps 2014-11-02 17:37:41 +0000
  • 7ac3a29506 am 3381416c: am cacf4c53: am 3c2f782c: When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED Martin Hibdon 2014-11-02 17:37:40 +0000
  • 4e91ba99ea 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 17:37:39 +0000
  • 678ca4bad5 am 636fed7d: am 33cf634a: am a64435a6: Update colors in Email (ColorRefactor) Rohan Shah 2014-11-02 17:37:38 +0000
  • 276f275c54 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 17:37:37 +0000
  • a1401e1c87 am 1ae6e4d9: am 4e794038: am 123d4028: Make sure to close a cursor Martin Hibdon 2014-11-02 17:37:36 +0000
  • 8a39dd5634 am 399e0c3c: am 32152d96: am f1b6b3af: Old paper clip asset is removed, which touches a test case here. James Lemieux 2014-11-02 17:37:35 +0000
  • e6556f74ba am 21f273ea: (-s ours) am bdfea7ff: (-s ours) am d54cebe5: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 17:37:34 +0000
  • b3d3051039 am a29c6884: am 8fd1a38c: am 9f252e1f: Renaming to support drawer under status bar. Andrew Sapperstein 2014-11-02 17:37:33 +0000
  • c95fa16f36 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 17:37:31 +0000
  • 67a1eec311 am 70f807fb: am 5ae1599a: am 0b693a05: Merge "Fix subfolders of the inbox." into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 17:37:30 +0000
  • 7bee86e74d am 55e10293: am dcaf7988: am 7f32e9c6: Prevent AccountSettingsFragment from being stripped Paul Westbrook 2014-11-02 17:37:29 +0000
  • 6a62de22e1 am 954b358a: am 26f193da: am bb68c13a: Changes to support smaller email tombstone apk size Paul Westbrook 2014-11-02 17:37:28 +0000
  • e2ab82c801 am 625bc3c0: am 6bf29750: am 88929fd2: Switch to targetSdkVersion=21. b/16408109 Andrew Sapperstein 2014-11-02 17:37:27 +0000
  • b96905a871 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 17:37:26 +0000
  • 7bf320a784 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 17:37:25 +0000
  • 472880614e am 416f9210: am 13666c7f: am 8209d6c0: Display a warning if account is on security hold Martin Hibdon 2014-11-02 17:37:24 +0000
  • f8ae0f7bfb am 505d411d: am 8645bd80: am 58d7f7b2: Merge "Tag Notifications with People (Email)" into ub-gmail-ur14-dev Rohan Shah 2014-11-02 17:37:22 +0000
  • 93d419dd2d am 40feb8f9: am 65d130ad: am b3be4655: Merge "Sync account immediately upon restore" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 17:37:21 +0000
  • a78ba75e45 am f44d334f: am ebfa64a7: am ce6e2de7: Merge "Use correct password dialog for outgoing settings" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 17:37:20 +0000
  • 2253810635 am d8800386: am 2d3730b5: am cb45d6fa: Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 17:37:19 +0000
  • 85313f47b7 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 17:37:18 +0000
  • 99219eb0e3 am 86dda976: am a79eed71: am c6d5ec49: No more big yellow envelope Tony Mantler 2014-11-02 17:37:17 +0000
  • 34370d5a6e am c2da7759: am 3262a8d8: am f866891f: Merge "Remove unused resources" into ub-gmail-ur14-dev Paul Westbrook 2014-11-02 17:37:15 +0000
  • ee2a66b5b0 am 3fb948e4: am 800d544a: am 8c6a01f8: Remove app icon from Setup and Mailbox Settings Tony Mantler 2014-11-02 17:37:14 +0000
  • 685f2f1d64 am 784b61cc: am 34a686ab: am dfb7fe91: Remove password spaces warning Tony Mantler 2014-11-02 17:37:13 +0000
  • 47a2f0f73a am cd77bc1b: am 58310123: am 0ee42176: Merge "Fix spinners layout mangling" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 17:37:12 +0000
  • 5401312847 am 091ed0db: am b4986725: am 6a07fc19: Merge "Remove unused resource" into ub-gmail-ur14-dev Paul Westbrook 2014-11-02 17:37:11 +0000
  • 4113c904f8 am 2562a4df: am 61e79746: am c845295f: Merge "Fix the text of the authentication label on rotation" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 17:37:10 +0000
  • 0f493a8618 am ec83f7fa: am 5b5d5585: am 86e17ba1: Merge "Set recents color for photoviewer. b/17389434" into ub-gmail-ur14-dev Andrew Sapperstein 2014-11-02 17:37:09 +0000
  • 93d724aa2b am 46f73c05: am 7266502c: am 3bdce9b5: Remove server-side sanitized HTML capability; add client-side santized HTML capability James Lemieux 2014-11-02 17:37:08 +0000
  • e62810f7f6 am ac26021d: am d50e207f: am 65669454: Set IME resize flag for AccountServerSettingsActivity Tony Mantler 2014-11-02 17:37:07 +0000
  • 32a6138d5a am 325afc41: am 04c77181: am 1be8b05b: The error message "This field can\'t be blank" can be ignored James Lemieux 2014-11-02 17:37:06 +0000
  • c7332f11fb am dd454375: (-s ours) am 9ea9d245: (-s ours) am efb6cb25: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 17:37:04 +0000
  • 91232a21f0 am 39aa4910: am 882e1a89: am e068440f: Merge "Update search folder status in a finally block" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 17:37:03 +0000
  • 1db58a95be am 2569cfcb: am 2ff1a5cd: am e87b38fa: Merge "Prevent account reconcilliation during migration" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 17:37:02 +0000
  • 341c8ef2ec am 33ab7b34: am 30d8d696: am 51c65364: Put debug screen back into settings Martin Hibdon 2014-11-02 17:37:01 +0000
  • 0a7f63e01f am eb3588bc: (-s ours) am 94d76eb9: (-s ours) Import translations. DO NOT MERGE automerge: 1c0aa4c -s ours Baligh Uddin 2014-11-02 17:37:00 +0000
  • 5d03847c3f am 0b27b809: am 8d6c6348: Should use stateAlwaysHidden for inputmode automerge: aa705e6 Jin Cao 2014-11-02 17:36:59 +0000
  • b0ad7f784b am cdf59599: am b7a5a10d: Merge "input mode to state hidden" into ub-gmail-ur14-dev automerge: e9186cd Jin Cao 2014-11-02 17:36:58 +0000
  • fb120f7c26 am dc952e5d: am 7ef66423: b/17209397. NOOP getServiceMap() if we are in the tombstone app. automerge: 0397e7f Anthony Lee 2014-11-02 17:36:56 +0000
  • 5b366acf0c am ac026ecb: am 0d2f843d: Remove getSuggestionsAuthority automerge: 65c2179 Jin Cao 2014-11-02 17:36:55 +0000
  • d0a67be950 am a357f81e: am 1991e2a9: Merge "Remove default search for Email" into ub-gmail-ur14-dev automerge: 9ac6ec7 Jin Cao 2014-11-02 17:36:53 +0000
  • 5a33a7899b am c48b9669: am 65bf9945: Fix search mailbox status on early-out when searching automerge: 207a35f Tony Mantler 2014-11-02 17:36:51 +0000
  • 89a36e1d44 am ea73ce47: am c71afebb: Fix some AOSP NPEs automerge: 473ce1f Tony Mantler 2014-11-02 17:36:50 +0000
  • 61a99bbb3b am 4f5e86fc: am 982394da: Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev automerge: 355e9df Anthony Lee 2014-11-02 17:36:48 +0000
  • e19bbf3815 am ee7eda0c: (-s ours) am 7e1932f7: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev automerge: 67995a4 -s ours Baligh Uddin 2014-11-02 17:36:47 +0000
  • 65911dc2d2 am 831bb0ab: am b0432334: Match dup accounts against all accounts, not just Email automerge: c1a760b Tony Mantler 2014-11-02 17:36:46 +0000
  • 4ae25d3b45 am ca31da91: am 9d1dc789: b/17135753. Make sure to free ServiceConnection. automerge: 8c65e50 Anthony Lee 2014-11-02 17:36:44 +0000
  • ad1137d1e6 am ecb6fc31: am 69dda480: Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev automerge: b042013 Andrew Sapperstein 2014-11-02 17:36:43 +0000
  • 49c8521dbb am 214cf5cf: am e34c3677: Merge "Drawer resource updates" into ub-gmail-ur14-dev automerge: 1e6f26a Tony Mantler 2014-11-02 17:36:42 +0000
  • 268485ff92 am b188964b: (-s ours) am 96ade4e2: (-s ours) Import translations. DO NOT MERGE Geoff Mendal 2014-11-02 17:30:44 +0000
  • f495b95d7a am 67b60f66: am b57bca27: Default to encrypted connections (YAY!) Tony Mantler 2014-11-02 17:30:43 +0000
  • ab743fb543 am 0f6acb54: am f0bbcd85: Add additional analytics regarding our SSLSockets Martin Hibdon 2014-11-02 17:30:42 +0000
  • 979511590c 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 17:30:41 +0000
  • dc6f3aafa8 am 85d0fdbe: am 303b553b: Allow an external security provider to be installed Martin Hibdon 2014-11-02 17:30:40 +0000
  • a67e221267 am be216a96: am a908d45a: Merge "Add deprecated cipher suites to our SSLSocket" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 17:30:39 +0000
  • 4827f0bc40 am f85d9e08: am 9d73facf: Merge "Fix restoreBodySource key so it returns the correct value." into ub-gmail-ur14-dev Anthony Lee 2014-11-02 17:30:38 +0000
  • c0e8417e68 am d77bf0c6: am 764d7b2f: Merge "Disable smart foward/reply" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 17:30:37 +0000
  • 968156982e am 34418383: (-s ours) am 98f764fb: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev Geoff Mendal 2014-11-02 17:30:36 +0000
  • 0f3a01a411 am 14286249: am d716d894: Don\'t assume mHostAuthRecv is loaded when checking outgoing Tony Mantler 2014-11-02 17:30:34 +0000
  • d82ae435ec am 461d3e74: am 1182e1f9: Merge "Fix handling AOL\'s login rejection" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 17:30:33 +0000
  • 8e9d01c9c3 am 2782b49d: (-s ours) am c2061fb3: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 17:30:32 +0000
  • 53e49db33a am 955b9f96: am d7192f02: Provider configuration for outlook, yahoo, gmx Régis Décamps 2014-11-02 17:30:31 +0000
  • 9332c48f56 am 349e6b91: am f61e098a: Correctly update UI_SYNC_STATUS upon search Martin Hibdon 2014-11-02 17:30:30 +0000
  • 683ceefaa5 am feb9d48a: (-s ours) am 58685874: (-s ours) Import translations. DO NOT MERGE Geoff Mendal 2014-11-02 17:30:28 +0000
  • fad809111c am 4ed38cc1: am 2128e365: Merge "Resend notifications when Accounts are changed" into ub-gmail-ur14-dev Régis Décamps 2014-11-02 17:30:27 +0000
  • 1a10b8f790 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 17:30:26 +0000
  • 14c08377e6 am 06e38818: am f9757504: Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 17:30:25 +0000
  • 6a9a2f43e9 am 433f689c: am 1d929d18: Initial account setup analytics Tony Mantler 2014-11-02 17:30:24 +0000
  • fba6f6f3a1 am 863984a7: (-s ours) am 4012d748: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev Geoff Mendal 2014-11-02 17:30:23 +0000
  • 0fd0268871 am d1599a86: am 72f6a243: Revert "Update notification icon asset names (Email)" Rohan Shah 2014-11-02 17:30:22 +0000
  • 56caa6e1c1 am bcbe5794: am cc82965a: Update notification icon asset names (Email) Rohan Shah 2014-11-02 17:30:20 +0000
  • d51891fb4c 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 17:30:19 +0000
  • f9292376a2 am 8a99e742: am 89272781: EmailProvider now supports query and getType for cached file urls Martin Hibdon 2014-11-02 17:30:18 +0000
  • 9d3b1a8d0e am 06cc928f: am 1927361b: Merge "Account authentication restyling" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 17:30:17 +0000
  • d606e82521 am f62b6843: am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev Régis Décamps 2014-11-02 17:30:16 +0000
  • 815252ad3d am 31966801: am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 17:30:15 +0000
  • f3a519c22b am d7063821: (-s ours) am 2a1daaae: (-s ours) Import translations. DO NOT MERGE Geoff Mendal 2014-11-02 17:30:14 +0000
  • 8182d3a77d am a3bfe727: (-s ours) am ab3ed2cb: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 17:30:13 +0000
  • c7d52321bc am 9ef12d1b: am 46f1b89f: Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 17:30:12 +0000
  • 468a0417dd am c95714b3: am ec8c2ac9: Merge "Calculate available background threads for AttachmentService correctly." into ub-gmail-ur14-dev Anthony Lee 2014-11-02 17:30:10 +0000
  • 80f4af5a15 am cf3aad64: am 42a4f201: Move Email Icons (Email) Rohan Shah 2014-11-02 17:30:09 +0000
  • 3884149d7c am a7d316c4: am 083a0138: Merge "Update Email Icons" into ub-gmail-ur14-dev Rohan Shah 2014-11-02 17:30:08 +0000
  • 6cef32da6f am a4b5463d: am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev Rohan Shah 2014-11-02 17:30:07 +0000
  • 67df0850e4 am 8a305452: am 6a533823: Merge "Clean-up Email Icons" into ub-gmail-ur14-dev Rohan Shah 2014-11-02 17:30:06 +0000
  • 2ba65aec8c am fa93a71b: am b62067e3: Make sure old body files don\'t contaminate new messages Tony Mantler 2014-11-02 17:30:05 +0000
  • c909ad1654 am 826e61c0: am 69ba565b: Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev James Lemieux 2014-11-02 17:30:04 +0000
  • 05629b2975 am e811c774: am 40236a89: Display sync errors using snackbar and not as a TL footer James Lemieux 2014-11-02 17:30:03 +0000
  • 5edde56b81 am 28a37183: (-s ours) am abd75d1a: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 17:30:02 +0000
  • 32bb6854fa am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar Régis Décamps 2014-11-02 17:30:01 +0000
  • 3381416c55 am cacf4c53: am 3c2f782c: When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED Martin Hibdon 2014-11-02 17:29:59 +0000
  • a9a341d959 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 17:29:58 +0000
  • 636fed7d0b am 33cf634a: am a64435a6: Update colors in Email (ColorRefactor) Rohan Shah 2014-11-02 17:29:57 +0000
  • 3c38f6ac95 am ef0dc0ac: am 809313bd: Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 17:29:55 +0000