Commit Graph

14278 Commits

Author SHA1 Message Date
Geoff Mendal 08fdc12c48 am 96815698: (-s ours) am 34418383: (-s ours) am 98f764fb: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '968156982e6cfeb8fc3ef25f242b05881483eec0':
  Import translations. DO NOT MERGE
2014-11-02 17:38:17 +00:00
Tony Mantler 12866ff17e am 0f3a01a4: am 14286249: am d716d894: Don\'t assume mHostAuthRecv is loaded when checking outgoing
* commit '0f3a01a411bee3d106b069d955763d5d5e6cb390':
  Don't assume mHostAuthRecv is loaded when checking outgoing
2014-11-02 17:38:16 +00:00
Tony Mantler bf98b875c2 am d82ae435: am 461d3e74: am 1182e1f9: Merge "Fix handling AOL\'s login rejection" into ub-gmail-ur14-dev
* commit 'd82ae435ec246cdfd8010c5f2934906d0247052b':
  Fix handling AOL's login rejection
2014-11-02 17:38:15 +00:00
Baligh Uddin 38a40ba654 am 8e9d01c9: (-s ours) am 2782b49d: (-s ours) am c2061fb3: (-s ours) Import translations. DO NOT MERGE
* commit '8e9d01c9c3907d0fd7c5db6ab74dc8956827d9b8':
  Import translations. DO NOT MERGE
2014-11-02 17:38:14 +00:00
Régis Décamps b678599530 am 53e49db3: am 955b9f96: am d7192f02: Provider configuration for outlook, yahoo, gmx
* commit '53e49db33a52cd1a270f16bc5c2b75d51ef6ffd6':
  Provider configuration for outlook, yahoo, gmx
2014-11-02 17:38:12 +00:00
Martin Hibdon f0987d3603 am 9332c48f: am 349e6b91: am f61e098a: Correctly update UI_SYNC_STATUS upon search
* commit '9332c48f563e4972f109cc8f8e6d7f4559665cec':
  Correctly update UI_SYNC_STATUS upon search
2014-11-02 17:38:11 +00:00
Geoff Mendal fe58e8e046 am 683ceefa: (-s ours) am feb9d48a: (-s ours) am 58685874: (-s ours) Import translations. DO NOT MERGE
* commit '683ceefaa58a459fdbf49feeacaf1fbaba5e0785':
  Import translations. DO NOT MERGE
2014-11-02 17:38:10 +00:00
Régis Décamps b5e2358fc1 am fad80911: am 4ed38cc1: am 2128e365: Merge "Resend notifications when Accounts are changed" into ub-gmail-ur14-dev
* commit 'fad809111cdd90117c2047b9b8625e2ddd9dadf0':
  Resend notifications when Accounts are changed
2014-11-02 17:38:09 +00:00
Martin Hibdon 06a3b26964 am 1a10b8f7: am e4a62a76: am 7b44fda9: Merge "Set mailbox uiSyncStatus when IMAP and POP folders are created" into ub-gmail-ur14-dev
* commit '1a10b8f790efaa917a619051fad8a09451693767':
  Set mailbox uiSyncStatus when IMAP and POP folders are created
2014-11-02 17:38:08 +00:00
Tony Mantler 200adbe935 am 14c08377: am 06e38818: am f9757504: Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev
* commit '14c08377e6f5b7b8ce0d604f69bfe3c6ec8ff96f':
  Reload settings immediately after toggling sync
2014-11-02 17:38:07 +00:00
Tony Mantler 22d25e3767 am 6a9a2f43: am 433f689c: am 1d929d18: Initial account setup analytics
* commit '6a9a2f43e9e732985c3be6c951cfdd0fe43156b2':
  Initial account setup analytics
2014-11-02 17:38:05 +00:00
Geoff Mendal 94c660a0bb am fba6f6f3: (-s ours) am 863984a7: (-s ours) am 4012d748: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit 'fba6f6f3a1f1884b109cd695c8e250cf4b0156d1':
  Import translations. DO NOT MERGE
2014-11-02 17:38:03 +00:00
Rohan Shah 56fd0d48b6 am 0fd02688: am d1599a86: am 72f6a243: Revert "Update notification icon asset names (Email)"
* commit '0fd02688716094bebe3a089a10101e17e8ce3d3f':
  Revert "Update notification icon asset names (Email)"
2014-11-02 17:38:02 +00:00
Rohan Shah c33016dc12 am 56caa6e1: am bcbe5794: am cc82965a: Update notification icon asset names (Email)
* commit '56caa6e1c1f769d038c570cc255e53e35641e2d3':
  Update notification icon asset names (Email)
2014-11-02 17:38:00 +00:00
Martin Hibdon 28230ce5c8 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 'd51891fb4c59decaa3b2656683d61a02e3aa1004':
  Set the search mailbox's syncState as soon as a search is requested
2014-11-02 17:37:59 +00:00
Martin Hibdon 62318ee61f am f9292376: am 8a99e742: am 89272781: EmailProvider now supports query and getType for cached file urls
* commit 'f9292376a22df42522023653e580ba8b69a6e449':
  EmailProvider now supports query and getType for cached file urls
2014-11-02 17:37:58 +00:00
Tony Mantler 92532b1c21 am 9d3b1a8d: am 06cc928f: am 1927361b: Merge "Account authentication restyling" into ub-gmail-ur14-dev
* commit '9d3b1a8d0eff6506fbe71b822a22e333f6cd5002':
  Account authentication restyling
2014-11-02 17:37:56 +00:00
Régis Décamps f24a5de95b am d606e825: am f62b6843: am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev
* commit 'd606e825211be26d0bddd80544d05f9fe9dd654c':
  Replace "Corporate" by "Exchange".
2014-11-02 17:37:55 +00:00
Tony Mantler 2b39de91bd am 815252ad: am 31966801: am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev
* commit '815252ad3d50c0e3855e3dfa4cd736becad6af86':
  Restyle account setup flow nav buttons
2014-11-02 17:37:54 +00:00
Geoff Mendal 813b5b9d78 am f3a519c2: (-s ours) am d7063821: (-s ours) am 2a1daaae: (-s ours) Import translations. DO NOT MERGE
* commit 'f3a519c22bd5c5e249451fced163af599d2ec9e4':
  Import translations. DO NOT MERGE
2014-11-02 17:37:53 +00:00
Baligh Uddin 037c43569e am 8182d3a7: (-s ours) am a3bfe727: (-s ours) am ab3ed2cb: (-s ours) Import translations. DO NOT MERGE
* commit '8182d3a77d81fee4f2697e98891582260cf8afbb':
  Import translations. DO NOT MERGE
2014-11-02 17:37:52 +00:00
Martin Hibdon b8209a4c6a am c7d52321: am 9ef12d1b: am 46f1b89f: Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev
* commit 'c7d52321bc2b882d04923204db5f1270e24c6bc8':
  Get SSLSocketFactory from GmsCore
2014-11-02 17:37:51 +00:00
Anthony Lee 82319a9867 am 468a0417: am c95714b3: am ec8c2ac9: Merge "Calculate available background threads for AttachmentService correctly." into ub-gmail-ur14-dev
* commit '468a0417dd57e64f079202252028583148fafb94':
  Calculate available background threads for AttachmentService correctly.
2014-11-02 17:37:50 +00:00
Rohan Shah 93a6c2c36a am 80f4af5a: am cf3aad64: am 42a4f201: Move Email Icons (Email)
* commit '80f4af5a15683d3e10806d9fc0573edcca812662':
  Move Email Icons (Email)
2014-11-02 17:37:49 +00:00
Rohan Shah 2df883ac09 am 3884149d: am a7d316c4: am 083a0138: Merge "Update Email Icons" into ub-gmail-ur14-dev
* commit '3884149d7c1c155ff9b454b185a78092e646d447':
  Update Email Icons
2014-11-02 17:37:48 +00:00
Rohan Shah 9486b7512e am 6cef32da: am a4b5463d: am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev
* commit '6cef32da6f660d5f6276c93daf929c74610b4603':
  Revert "Clean-up Email Icons"
2014-11-02 17:37:47 +00:00
Rohan Shah d2ad093397 am 67df0850: am 8a305452: am 6a533823: Merge "Clean-up Email Icons" into ub-gmail-ur14-dev
* commit '67df0850e412c6278264e989af63e8964bfdca86':
  Clean-up Email Icons
2014-11-02 17:37:46 +00:00
Tony Mantler 941d0a4661 am 2ba65aec: am fa93a71b: am b62067e3: Make sure old body files don\'t contaminate new messages
* commit '2ba65aec8c978447e3b5e03be715d99430ebf009':
  Make sure old body files don't contaminate new messages
2014-11-02 17:37:45 +00:00
James Lemieux 417c1deda2 am c909ad16: am 826e61c0: am 69ba565b: Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev
* commit 'c909ad1654b544f83a6fc8271c210a016773e0d8':
  Combined view should also display client-side sanitized HTML
2014-11-02 17:37:44 +00:00
James Lemieux ab841bb554 am 05629b29: am e811c774: am 40236a89: Display sync errors using snackbar and not as a TL footer
* commit '05629b29751ffa6a0c0b725547628b2146f46dd6':
  Display sync errors using snackbar and not as a TL footer
2014-11-02 17:37:43 +00:00
Baligh Uddin a8fee47f76 am 5edde56b: (-s ours) am 28a37183: (-s ours) am abd75d1a: (-s ours) Import translations. DO NOT MERGE
* commit '5edde56b813d8c2e27accaf0c418d5f6203593db':
  Import translations. DO NOT MERGE
2014-11-02 17:37:42 +00:00
Régis Décamps c097bb3d20 am 32bb6854: am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar
* commit '32bb6854fa27f42d3dc8e0815b1b43aeed4930b5':
  minor: remove comment that primaryColor is used for ActionBar
2014-11-02 17:37:41 +00:00
Martin Hibdon 7ac3a29506 am 3381416c: am cacf4c53: am 3c2f782c: When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
* commit '3381416c557cf0b1bff10332cdc90f438d77936b':
  When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
2014-11-02 17:37:40 +00:00
Martin Hibdon 4e91ba99ea am a9a341d9: am e9a49c17: am d10ae46e: Merge "Don\'t allow disabling of the camera with managed profiles" into ub-gmail-ur14-dev
* commit 'a9a341d959d424671b22941f0d3d9bc6bd0b392b':
  Don't allow disabling of the camera with managed profiles
2014-11-02 17:37:39 +00:00
Rohan Shah 678ca4bad5 am 636fed7d: am 33cf634a: am a64435a6: Update colors in Email (ColorRefactor)
* commit '636fed7d0b551d284521bdec097d2339c493e741':
  Update colors in Email (ColorRefactor)
2014-11-02 17:37:38 +00:00
Martin Hibdon 276f275c54 am 3c38f6ac: am ef0dc0ac: am 809313bd: Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev
* commit '3c38f6ac9508786542fb22fb87b51d0121925c8c':
  Add ability to clear migration state to debug screen
2014-11-02 17:37:37 +00:00
Martin Hibdon a1401e1c87 am 1ae6e4d9: am 4e794038: am 123d4028: Make sure to close a cursor
* commit '1ae6e4d9dab4e98e2903ca140651fe43fbbb3358':
  Make sure to close a cursor
2014-11-02 17:37:36 +00:00
James Lemieux 8a39dd5634 am 399e0c3c: am 32152d96: am f1b6b3af: Old paper clip asset is removed, which touches a test case here.
* commit '399e0c3cf701a5751549d060140c841d0bfbfb64':
  Old paper clip asset is removed, which touches a test case here.
2014-11-02 17:37:35 +00:00
Baligh Uddin e6556f74ba am 21f273ea: (-s ours) am bdfea7ff: (-s ours) am d54cebe5: (-s ours) Import translations. DO NOT MERGE
* commit '21f273ea8be828243c3ed34bb723b4f3de6bcf5d':
  Import translations. DO NOT MERGE
2014-11-02 17:37:34 +00:00
Andrew Sapperstein b3d3051039 am a29c6884: am 8fd1a38c: am 9f252e1f: Renaming to support drawer under status bar.
* commit 'a29c6884397b35bab88ce81eb062624532a7c467':
  Renaming to support drawer under status bar.
2014-11-02 17:37:33 +00:00
Baligh Uddin c95fa16f36 am 570fce60: (-s ours) am 928bbfef: (-s ours) am fc1ba99a: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '570fce60686e95e96dccd52cd3c77c441f9d5999':
  Import translations. DO NOT MERGE
2014-11-02 17:37:31 +00:00
Martin Hibdon 67a1eec311 am 70f807fb: am 5ae1599a: am 0b693a05: Merge "Fix subfolders of the inbox." into ub-gmail-ur14-dev
* commit '70f807fb64287bc0e7ac055cdd252ca359ca8c84':
  Fix subfolders of the inbox.
2014-11-02 17:37:30 +00:00
Paul Westbrook 7bee86e74d am 55e10293: am dcaf7988: am 7f32e9c6: Prevent AccountSettingsFragment from being stripped
* commit '55e10293a85f762a80d9ed4b6c57717c43768ad3':
  Prevent AccountSettingsFragment from being stripped
2014-11-02 17:37:29 +00:00
Paul Westbrook 6a62de22e1 am 954b358a: am 26f193da: am bb68c13a: Changes to support smaller email tombstone apk size
* commit '954b358a26fbd917746161218482f2748a113723':
  Changes to support smaller email tombstone apk size
2014-11-02 17:37:28 +00:00
Andrew Sapperstein e2ab82c801 am 625bc3c0: am 6bf29750: am 88929fd2: Switch to targetSdkVersion=21. b/16408109
* commit '625bc3c04ebd2dca2b27e2a510b2d83853ce5c7b':
  Switch to targetSdkVersion=21. b/16408109
2014-11-02 17:37:27 +00:00
Baligh Uddin b96905a871 am 45f0c596: (-s ours) am 503f4638: (-s ours) am 3b47856d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '45f0c596e8cfcaf97b93a09798f6b2eb3a82d960':
  Import translations. DO NOT MERGE
2014-11-02 17:37:26 +00:00
Baligh Uddin 7bf320a784 am 1b24aa02: (-s ours) am 99cf59cb: (-s ours) am ff83aff9: (-s ours) am e421a5e1: (-s ours) Import translations. DO NOT MERGE
* commit '1b24aa0265cee43c73d96371c9a454cb39af2d51':
  Import translations. DO NOT MERGE
2014-11-02 17:37:25 +00:00
Martin Hibdon 472880614e am 416f9210: am 13666c7f: am 8209d6c0: Display a warning if account is on security hold
* commit '416f921021dcc06c86fd3c0c5d7bfd1800eafd94':
  Display a warning if account is on security hold
2014-11-02 17:37:24 +00:00
Rohan Shah f8ae0f7bfb am 505d411d: am 8645bd80: am 58d7f7b2: Merge "Tag Notifications with People (Email)" into ub-gmail-ur14-dev
* commit '505d411dfa84773c8c1f5e9dfc6214f955bf1bd9':
  Tag Notifications with People (Email)
2014-11-02 17:37:22 +00:00
Tony Mantler 93d419dd2d am 40feb8f9: am 65d130ad: am b3be4655: Merge "Sync account immediately upon restore" into ub-gmail-ur14-dev
* commit '40feb8f94d0a821d9a9cef0c14b19eb4db53dc68':
  Sync account immediately upon restore
2014-11-02 17:37:21 +00:00