Martin Hibdon
|
c107d01365
|
am 40b9f3c7: am f0987d36: am 9332c48f: am 349e6b91: am f61e098a: Correctly update UI_SYNC_STATUS upon search
* commit '40b9f3c7df410faf9a836990283f9a2030b23316':
Correctly update UI_SYNC_STATUS upon search
|
2014-11-02 19:03:14 +00:00 |
|
Geoff Mendal
|
f08c63b3c8
|
am b4c0eba7: (-s ours) am fe58e8e0: (-s ours) am 683ceefa: (-s ours) am feb9d48a: (-s ours) am 58685874: (-s ours) Import translations. DO NOT MERGE
* commit 'b4c0eba750e5b5c1044af06e29d18da47a1d436d':
Import translations. DO NOT MERGE
|
2014-11-02 19:03:13 +00:00 |
|
Régis Décamps
|
e689fb3c66
|
am 81d5ed1f: am b5e2358f: am fad80911: am 4ed38cc1: am 2128e365: Merge "Resend notifications when Accounts are changed" into ub-gmail-ur14-dev
* commit '81d5ed1f1073a4428f7a92f06e612c258390403f':
Resend notifications when Accounts are changed
|
2014-11-02 19:03:12 +00:00 |
|
Martin Hibdon
|
ee82bac726
|
am e8bcbd31: am 06a3b269: am 1a10b8f7: am e4a62a76: am 7b44fda9: Merge "Set mailbox uiSyncStatus when IMAP and POP folders are created" into ub-gmail-ur14-dev
* commit 'e8bcbd3159862f07bf53e709221a4d0389e54701':
Set mailbox uiSyncStatus when IMAP and POP folders are created
|
2014-11-02 19:03:10 +00:00 |
|
Tony Mantler
|
774ab0e296
|
am 5249a10e: am 200adbe9: am 14c08377: am 06e38818: am f9757504: Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev
* commit '5249a10e8cc32edd6b93dbd63ae1695629b5b0c3':
Reload settings immediately after toggling sync
|
2014-11-02 19:03:09 +00:00 |
|
Tony Mantler
|
f6524f4c80
|
am bd9add46: am 22d25e37: am 6a9a2f43: am 433f689c: am 1d929d18: Initial account setup analytics
* commit 'bd9add46f66b717cba786eb99e0aeb43c86d70ea':
Initial account setup analytics
|
2014-11-02 19:03:08 +00:00 |
|
Geoff Mendal
|
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
* commit '107cacf51e78053178c3c222d7335a45f10e32e4':
Import translations. DO NOT MERGE
|
2014-11-02 19:03:07 +00:00 |
|
Rohan Shah
|
65658de392
|
am 94409eea: am 56fd0d48: am 0fd02688: am d1599a86: am 72f6a243: Revert "Update notification icon asset names (Email)"
* commit '94409eea473f081984050df88b0f32fcf1b23c8c':
Revert "Update notification icon asset names (Email)"
|
2014-11-02 19:03:06 +00:00 |
|
Rohan Shah
|
eed3e23f39
|
am 9e15a653: am c33016dc: am 56caa6e1: am bcbe5794: am cc82965a: Update notification icon asset names (Email)
* commit '9e15a6537ede6588acdfea7f5673aaf5fddcb38e':
Update notification icon asset names (Email)
|
2014-11-02 19:03:05 +00:00 |
|
Martin Hibdon
|
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
* commit 'f120e97a74f5a7de871ad9c5da89992bdd001c1a':
Set the search mailbox's syncState as soon as a search is requested
|
2014-11-02 19:03:04 +00:00 |
|
Martin Hibdon
|
40899215fe
|
am 562f5c96: am 62318ee6: am f9292376: am 8a99e742: am 89272781: EmailProvider now supports query and getType for cached file urls
* commit '562f5c960952b8ed36b082e73ebf9a8795102a94':
EmailProvider now supports query and getType for cached file urls
|
2014-11-02 19:03:03 +00:00 |
|
Tony Mantler
|
8d046b0a80
|
am 09897615: am 92532b1c: am 9d3b1a8d: am 06cc928f: am 1927361b: Merge "Account authentication restyling" into ub-gmail-ur14-dev
* commit '09897615294375fedd434e345bf90cf8e99680d1':
Account authentication restyling
|
2014-11-02 19:03:01 +00:00 |
|
Régis Décamps
|
2a97b79384
|
am 66af7782: am f24a5de9: am d606e825: am f62b6843: am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev
* commit '66af7782fe54c4b788d946d7311bb9feaec9b253':
Replace "Corporate" by "Exchange".
|
2014-11-02 19:03:00 +00:00 |
|
Tony Mantler
|
c8fee48f2e
|
am 18e8b55b: am 2b39de91: am 815252ad: am 31966801: am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev
* commit '18e8b55b75294704277b82ecab26ec13577e8d2b':
Restyle account setup flow nav buttons
|
2014-11-02 19:02:59 +00:00 |
|
Geoff Mendal
|
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
* commit 'b64e1d26686257501cce94e5abe27a42b2cf6de7':
Import translations. DO NOT MERGE
|
2014-11-02 19:02:57 +00:00 |
|
Baligh Uddin
|
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
* commit 'a4ec3b6348621679fcb62286deab699a9472b3ea':
Import translations. DO NOT MERGE
|
2014-11-02 19:02:56 +00:00 |
|
Martin Hibdon
|
f027de693e
|
am f44db892: am b8209a4c: am c7d52321: am 9ef12d1b: am 46f1b89f: Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev
* commit 'f44db892ecaaea92f4fcebc2c90a1998fcda954d':
Get SSLSocketFactory from GmsCore
|
2014-11-02 19:02:54 +00:00 |
|
Anthony Lee
|
b3eca7880c
|
am 51710a73: am 82319a98: am 468a0417: am c95714b3: am ec8c2ac9: Merge "Calculate available background threads for AttachmentService correctly." into ub-gmail-ur14-dev
* commit '51710a73cd1754a9594a8794fa658d98e6ee326a':
Calculate available background threads for AttachmentService correctly.
|
2014-11-02 19:02:53 +00:00 |
|
Rohan Shah
|
e9a520f9ef
|
am e1c103dc: am 93a6c2c3: am 80f4af5a: am cf3aad64: am 42a4f201: Move Email Icons (Email)
* commit 'e1c103dc6ed458c980d1c3bea6c15781a99db650':
Move Email Icons (Email)
|
2014-11-02 19:02:51 +00:00 |
|
Rohan Shah
|
7e40de1bcc
|
am 7073065d: am 2df883ac: am 3884149d: am a7d316c4: am 083a0138: Merge "Update Email Icons" into ub-gmail-ur14-dev
* commit '7073065d34ec2b6a08b04199b860c7812d2902d3':
Update Email Icons
|
2014-11-02 19:02:50 +00:00 |
|
Rohan Shah
|
45af012ad3
|
am 0114c401: am 9486b751: am 6cef32da: am a4b5463d: am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev
* commit '0114c4017fcf22852d1a03dd50496f8bfae53790':
Revert "Clean-up Email Icons"
|
2014-11-02 19:02:48 +00:00 |
|
Rohan Shah
|
d14760b69b
|
am e57e10a4: am d2ad0933: am 67df0850: am 8a305452: am 6a533823: Merge "Clean-up Email Icons" into ub-gmail-ur14-dev
* commit 'e57e10a434ebbd6ada801f18e945f386dc960dcc':
Clean-up Email Icons
|
2014-11-02 19:02:47 +00:00 |
|
Tony Mantler
|
0c39ba15f9
|
am 0c6747a6: am 941d0a46: am 2ba65aec: am fa93a71b: am b62067e3: Make sure old body files don\'t contaminate new messages
* commit '0c6747a60d09b9c9aa0d3f717d8c19d66d7a67a5':
Make sure old body files don't contaminate new messages
|
2014-11-02 19:02:45 +00:00 |
|
James Lemieux
|
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
* commit 'f247d7e02e4aae32698256a5776f19760d27b0ea':
Combined view should also display client-side sanitized HTML
|
2014-11-02 19:02:44 +00:00 |
|
James Lemieux
|
c8c3c7105e
|
am bb8efd35: am ab841bb5: am 05629b29: am e811c774: am 40236a89: Display sync errors using snackbar and not as a TL footer
* commit 'bb8efd358360d8277f5de6c75f81c9118294aec8':
Display sync errors using snackbar and not as a TL footer
|
2014-11-02 19:02:42 +00:00 |
|
Baligh Uddin
|
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
* commit '9d6bb2cf84a442d5ff801e5e9ded7ac2003ff8ca':
Import translations. DO NOT MERGE
|
2014-11-02 19:02:40 +00:00 |
|
Régis Décamps
|
9fec8062d5
|
am 5d9a2f3d: am c097bb3d: am 32bb6854: am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar
* commit '5d9a2f3df05cc39dc10857bd372c4fb1cc94effb':
minor: remove comment that primaryColor is used for ActionBar
|
2014-11-02 19:02:38 +00:00 |
|
Martin Hibdon
|
2e4a3dbfae
|
am d5bded58: am 7ac3a295: am 3381416c: am cacf4c53: am 3c2f782c: When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
* commit 'd5bded58648d8b14788ced34c55ef03a7914072c':
When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
|
2014-11-02 19:02:36 +00:00 |
|
Martin Hibdon
|
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
* commit '036d581c8ceea984f2eeedbdfb6246c85b636708':
Don't allow disabling of the camera with managed profiles
|
2014-11-02 19:02:34 +00:00 |
|
Rohan Shah
|
bad4e4694e
|
am 22f8218c: am 678ca4ba: am 636fed7d: am 33cf634a: am a64435a6: Update colors in Email (ColorRefactor)
* commit '22f8218ccf8756fb4c7479d54dd0d19175ad1944':
Update colors in Email (ColorRefactor)
|
2014-11-02 19:02:33 +00:00 |
|
Martin Hibdon
|
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
* commit '639c2f80b8a91f0b027f5310cb97fb5f08496405':
Add ability to clear migration state to debug screen
|
2014-11-02 19:02:31 +00:00 |
|
Martin Hibdon
|
f214c7effe
|
am ffc9591c: am a1401e1c: am 1ae6e4d9: am 4e794038: am 123d4028: Make sure to close a cursor
* commit 'ffc9591cfcfcbc4811a003241e27c20de51afd59':
Make sure to close a cursor
|
2014-11-02 19:02:29 +00:00 |
|
James Lemieux
|
1286b3fc3d
|
am a94b86e5: am 8a39dd56: am 399e0c3c: am 32152d96: am f1b6b3af: Old paper clip asset is removed, which touches a test case here.
* commit 'a94b86e5837cec198a77bdf717f8754202187fc8':
Old paper clip asset is removed, which touches a test case here.
|
2014-11-02 19:02:28 +00:00 |
|
Baligh Uddin
|
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
* commit '4fe3ac93b8b320258d060ba5949d17a9e200ac02':
Import translations. DO NOT MERGE
|
2014-11-02 19:02:26 +00:00 |
|
Andrew Sapperstein
|
6c0795a3e5
|
am 672eb2b2: am b3d30510: am a29c6884: am 8fd1a38c: am 9f252e1f: Renaming to support drawer under status bar.
* commit '672eb2b2789a917d23a167c22a64c4ecdd56e375':
Renaming to support drawer under status bar.
|
2014-11-02 19:02:25 +00:00 |
|
Baligh Uddin
|
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
* commit '0aa4e56ffa99b2c32db7f1ac1523d153f8389681':
Import translations. DO NOT MERGE
|
2014-11-02 19:02:23 +00:00 |
|
Martin Hibdon
|
5eb19a6d6d
|
am 1a38750f: am 67a1eec3: am 70f807fb: am 5ae1599a: am 0b693a05: Merge "Fix subfolders of the inbox." into ub-gmail-ur14-dev
* commit '1a38750f90e2971d38d8385557b33a746a6bce49':
Fix subfolders of the inbox.
|
2014-11-02 19:02:21 +00:00 |
|
Paul Westbrook
|
6ce676a212
|
am 74055e85: am 7bee86e7: am 55e10293: am dcaf7988: am 7f32e9c6: Prevent AccountSettingsFragment from being stripped
* commit '74055e85a78113b1b00fbb2e22d1bc009ff58ac3':
Prevent AccountSettingsFragment from being stripped
|
2014-11-02 19:02:20 +00:00 |
|
Paul Westbrook
|
cc8f214ccd
|
am 5080a3ad: am 6a62de22: am 954b358a: am 26f193da: am bb68c13a: Changes to support smaller email tombstone apk size
* commit '5080a3adbf658a8323cf3d7eaa7247b383de41e1':
Changes to support smaller email tombstone apk size
|
2014-11-02 19:02:18 +00:00 |
|
Andrew Sapperstein
|
18a3b7a387
|
am 38b299b8: am e2ab82c8: am 625bc3c0: am 6bf29750: am 88929fd2: Switch to targetSdkVersion=21. b/16408109
* commit '38b299b8dd5e2cc174728cb7b08e625bb0cc226c':
Switch to targetSdkVersion=21. b/16408109
|
2014-11-02 19:02:16 +00:00 |
|
Baligh Uddin
|
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
* commit '9cb90c3a60cec08fbf3ce60ed1f23144873b58bf':
Import translations. DO NOT MERGE
|
2014-11-02 19:02:14 +00:00 |
|
Baligh Uddin
|
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
* commit '903a81df6de6f3affc04372d8a7d3a264455d574':
Import translations. DO NOT MERGE
|
2014-11-02 19:02:12 +00:00 |
|
Martin Hibdon
|
6702177e81
|
am 0df19789: am 47288061: am 416f9210: am 13666c7f: am 8209d6c0: Display a warning if account is on security hold
* commit '0df19789c920acedc3f0a17cd867b6bac1e18b5a':
Display a warning if account is on security hold
|
2014-11-02 19:02:10 +00:00 |
|
Rohan Shah
|
2ca7643f4d
|
am 13ced23c: am f8ae0f7b: am 505d411d: am 8645bd80: am 58d7f7b2: Merge "Tag Notifications with People (Email)" into ub-gmail-ur14-dev
* commit '13ced23c496be6b22e1f0484cd96ffb65ab5bfe3':
Tag Notifications with People (Email)
|
2014-11-02 19:02:08 +00:00 |
|
Tony Mantler
|
5b93ef6df1
|
am a6446151: am 93d419dd: am 40feb8f9: am 65d130ad: am b3be4655: Merge "Sync account immediately upon restore" into ub-gmail-ur14-dev
* commit 'a6446151cc450bce7e01e07d40a54bd0de67c791':
Sync account immediately upon restore
|
2014-11-02 19:02:06 +00:00 |
|
Tony Mantler
|
26859ae360
|
am 008d5501: am a78ba75e: am f44d334f: am ebfa64a7: am ce6e2de7: Merge "Use correct password dialog for outgoing settings" into ub-gmail-ur14-dev
* commit '008d5501d91dbe67d3accb3a36eee363d71e2a91':
Use correct password dialog for outgoing settings
|
2014-11-02 19:02:04 +00:00 |
|
Tony Mantler
|
9115a12218
|
am eaafa9a9: am 22538106: am d8800386: am 2d3730b5: am cb45d6fa: Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev
* commit 'eaafa9a9748709187c998a8a563a9aacb7b35a70':
Change account type strings for AccountManager UI
|
2014-11-02 19:02:02 +00:00 |
|
Baligh Uddin
|
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
* commit 'e27ea4a2dbf845545c1155165b20280ef646c6d8':
Import translations. DO NOT MERGE
|
2014-11-02 19:01:59 +00:00 |
|
Tony Mantler
|
dd5a7dad81
|
am 0fa53a33: am 99219eb0: am 86dda976: am a79eed71: am c6d5ec49: No more big yellow envelope
* commit '0fa53a3367458100abed2cf2091482911c544495':
No more big yellow envelope
|
2014-11-02 19:01:57 +00:00 |
|
Paul Westbrook
|
a54d0838b7
|
resolved conflicts for merge of 6666fbf0 to master
Change-Id: I92e53c11119cda4efa3816b5ae030c278bda1290
|
2014-11-02 11:00:40 -08:00 |
|