Commit Graph

14178 Commits

Author SHA1 Message Date
Baligh Uddin a4ec3b6348 am 037c4356: (-s ours) am 8182d3a7: (-s ours) am a3bfe727: (-s ours) am ab3ed2cb: (-s ours) Import translations. DO NOT MERGE
* commit '037c43569e3ef52639c1480f1834f3dd8601410f':
  Import translations. DO NOT MERGE
2014-11-02 18:53:05 +00:00
Martin Hibdon f44db892ec am b8209a4c: am c7d52321: am 9ef12d1b: am 46f1b89f: Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev
* commit 'b8209a4c6ad160f2f65c7fb57d86a6967f45a8ad':
  Get SSLSocketFactory from GmsCore
2014-11-02 18:53:03 +00:00
Anthony Lee 51710a73cd am 82319a98: am 468a0417: am c95714b3: am ec8c2ac9: Merge "Calculate available background threads for AttachmentService correctly." into ub-gmail-ur14-dev
* commit '82319a98679e1882a2ae0358f347e25e5ab1e836':
  Calculate available background threads for AttachmentService correctly.
2014-11-02 18:53:02 +00:00
Rohan Shah e1c103dc6e am 93a6c2c3: am 80f4af5a: am cf3aad64: am 42a4f201: Move Email Icons (Email)
* commit '93a6c2c36adfa051192822c99c3dc2a834accab9':
  Move Email Icons (Email)
2014-11-02 18:53:01 +00:00
Rohan Shah 7073065d34 am 2df883ac: am 3884149d: am a7d316c4: am 083a0138: Merge "Update Email Icons" into ub-gmail-ur14-dev
* commit '2df883ac0947958ed97cd83e90998d8a5ed02729':
  Update Email Icons
2014-11-02 18:53:00 +00:00
Rohan Shah 0114c4017f am 9486b751: am 6cef32da: am a4b5463d: am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev
* commit '9486b7512ee4eb30136593f29290ba6f56b8803d':
  Revert "Clean-up Email Icons"
2014-11-02 18:52:59 +00:00
Rohan Shah e57e10a434 am d2ad0933: am 67df0850: am 8a305452: am 6a533823: Merge "Clean-up Email Icons" into ub-gmail-ur14-dev
* commit 'd2ad0933973dcee022f57231ed946d848bcc8e8c':
  Clean-up Email Icons
2014-11-02 18:52:57 +00:00
Tony Mantler 0c6747a60d am 941d0a46: am 2ba65aec: am fa93a71b: am b62067e3: Make sure old body files don\'t contaminate new messages
* commit '941d0a4661ef13189f9696949947e5d40f6014ad':
  Make sure old body files don't contaminate new messages
2014-11-02 18:52:56 +00:00
James Lemieux f247d7e02e am 417c1ded: am c909ad16: am 826e61c0: am 69ba565b: Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev
* commit '417c1deda20fd5cb76940038a2762a0f0de0b003':
  Combined view should also display client-side sanitized HTML
2014-11-02 18:52:55 +00:00
James Lemieux bb8efd3583 am ab841bb5: am 05629b29: am e811c774: am 40236a89: Display sync errors using snackbar and not as a TL footer
* commit 'ab841bb5548dbf40ff896ad2e2ad128db676af72':
  Display sync errors using snackbar and not as a TL footer
2014-11-02 18:52:54 +00:00
Baligh Uddin 9d6bb2cf84 am a8fee47f: (-s ours) am 5edde56b: (-s ours) am 28a37183: (-s ours) am abd75d1a: (-s ours) Import translations. DO NOT MERGE
* commit 'a8fee47f76fceee347cfbea0d7afd1673736acd0':
  Import translations. DO NOT MERGE
2014-11-02 18:52:53 +00:00
Régis Décamps 5d9a2f3df0 am c097bb3d: am 32bb6854: am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar
* commit 'c097bb3d20a2824591a93fc07a6ffef8ddc95fa1':
  minor: remove comment that primaryColor is used for ActionBar
2014-11-02 18:52:52 +00:00
Martin Hibdon d5bded5864 am 7ac3a295: am 3381416c: am cacf4c53: am 3c2f782c: When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
* commit '7ac3a29506003bdd1229c610a57e04d2c602f51b':
  When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
2014-11-02 18:52:51 +00:00
Martin Hibdon 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
* commit '4e91ba99ea874edb91b5178fc3dd3ab36ad3f03a':
  Don't allow disabling of the camera with managed profiles
2014-11-02 18:52:49 +00:00
Rohan Shah 22f8218ccf am 678ca4ba: am 636fed7d: am 33cf634a: am a64435a6: Update colors in Email (ColorRefactor)
* commit '678ca4bad5c7091aa0f22b8e7643734a692d94a5':
  Update colors in Email (ColorRefactor)
2014-11-02 18:52:48 +00:00
Martin Hibdon 639c2f80b8 am 276f275c: am 3c38f6ac: am ef0dc0ac: am 809313bd: Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev
* commit '276f275c542405f7dede5d5258532391fec322ea':
  Add ability to clear migration state to debug screen
2014-11-02 18:52:42 +00:00
Martin Hibdon ffc9591cfc am a1401e1c: am 1ae6e4d9: am 4e794038: am 123d4028: Make sure to close a cursor
* commit 'a1401e1c87cb6fe339d2709c67c628c4132241e4':
  Make sure to close a cursor
2014-11-02 18:52:41 +00:00
James Lemieux a94b86e583 am 8a39dd56: am 399e0c3c: am 32152d96: am f1b6b3af: Old paper clip asset is removed, which touches a test case here.
* commit '8a39dd56340050e3fdcb08c2aea806e26362b587':
  Old paper clip asset is removed, which touches a test case here.
2014-11-02 18:52:40 +00:00
Baligh Uddin 4fe3ac93b8 am e6556f74: (-s ours) am 21f273ea: (-s ours) am bdfea7ff: (-s ours) am d54cebe5: (-s ours) Import translations. DO NOT MERGE
* commit 'e6556f74ba3873d6a06bf6fe8ad839a4bda5274c':
  Import translations. DO NOT MERGE
2014-11-02 18:52:39 +00:00
Andrew Sapperstein 672eb2b278 am b3d30510: am a29c6884: am 8fd1a38c: am 9f252e1f: Renaming to support drawer under status bar.
* commit 'b3d305103951106045f524eb76f605558ce9060d':
  Renaming to support drawer under status bar.
2014-11-02 18:52:38 +00:00
Baligh Uddin 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
* commit 'c95fa16f362fb56ef06aa415ac96d8d353a10665':
  Import translations. DO NOT MERGE
2014-11-02 18:52:37 +00:00
Martin Hibdon 1a38750f90 am 67a1eec3: am 70f807fb: am 5ae1599a: am 0b693a05: Merge "Fix subfolders of the inbox." into ub-gmail-ur14-dev
* commit '67a1eec311ca0e37d26ed5e8db221de48f488b7c':
  Fix subfolders of the inbox.
2014-11-02 18:52:36 +00:00
Paul Westbrook 74055e85a7 am 7bee86e7: am 55e10293: am dcaf7988: am 7f32e9c6: Prevent AccountSettingsFragment from being stripped
* commit '7bee86e74d6f79eded57af287f49d41a53e66806':
  Prevent AccountSettingsFragment from being stripped
2014-11-02 18:52:35 +00:00
Paul Westbrook 5080a3adbf am 6a62de22: am 954b358a: am 26f193da: am bb68c13a: Changes to support smaller email tombstone apk size
* commit '6a62de22e14b9b01274f14aacfcbf968a7da39dc':
  Changes to support smaller email tombstone apk size
2014-11-02 18:52:34 +00:00
Andrew Sapperstein 38b299b8dd am e2ab82c8: am 625bc3c0: am 6bf29750: am 88929fd2: Switch to targetSdkVersion=21. b/16408109
* commit 'e2ab82c801896c371d94fd249a662a911dc0cd34':
  Switch to targetSdkVersion=21. b/16408109
2014-11-02 18:52:33 +00:00
Baligh Uddin 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
* commit 'b96905a87194e82ec823fc8abccadc66df8cf4c9':
  Import translations. DO NOT MERGE
2014-11-02 18:52:32 +00:00
Baligh Uddin 903a81df6d 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 '7bf320a78438fe2cfb7d9d6ad42f631d1fae7a4e':
  Import translations. DO NOT MERGE
2014-11-02 18:52:31 +00:00
Martin Hibdon 0df19789c9 am 47288061: am 416f9210: am 13666c7f: am 8209d6c0: Display a warning if account is on security hold
* commit '472880614e9d72916b18a3840df119a43ca667e7':
  Display a warning if account is on security hold
2014-11-02 18:52:29 +00:00
Rohan Shah 13ced23c49 am f8ae0f7b: am 505d411d: am 8645bd80: am 58d7f7b2: Merge "Tag Notifications with People (Email)" into ub-gmail-ur14-dev
* commit 'f8ae0f7bfbaf7619bd91d4bb60e9aebb062199d2':
  Tag Notifications with People (Email)
2014-11-02 18:52:28 +00:00
Tony Mantler a6446151cc am 93d419dd: am 40feb8f9: am 65d130ad: am b3be4655: Merge "Sync account immediately upon restore" into ub-gmail-ur14-dev
* commit '93d419dd2d61962974f288e5b640477d26da2825':
  Sync account immediately upon restore
2014-11-02 18:52:27 +00:00
Tony Mantler 008d5501d9 am a78ba75e: am f44d334f: am ebfa64a7: am ce6e2de7: Merge "Use correct password dialog for outgoing settings" into ub-gmail-ur14-dev
* commit 'a78ba75e45680484cfeb95f80f13f2127f76ed1e':
  Use correct password dialog for outgoing settings
2014-11-02 18:52:25 +00:00
Tony Mantler eaafa9a974 am 22538106: am d8800386: am 2d3730b5: am cb45d6fa: Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev
* commit '2253810635b44672c654cbf6c23f6babbf00c645':
  Change account type strings for AccountManager UI
2014-11-02 18:52:23 +00:00
Baligh Uddin e27ea4a2db 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 '85313f47b7761e95f00b625d1ab7f0c3aa2ea808':
  Import translations. DO NOT MERGE
2014-11-02 18:52:22 +00:00
Tony Mantler 0fa53a3367 am 99219eb0: am 86dda976: am a79eed71: am c6d5ec49: No more big yellow envelope
* commit '99219eb0e301e75f392861b7282eec342864c62e':
  No more big yellow envelope
2014-11-02 18:52:20 +00:00
Paul Westbrook 6666fbf090 resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp
Change-Id: I28a5355b850c271bdead47874d586c557e4557f6
2014-11-02 10:49:50 -08:00
Paul Westbrook 7dd59de700 am 2ca250a9: am 47ee4637: resolved conflicts for merge of 19809304 to lmp-sprout-dev
* commit '2ca250a9b7cdf835bb86dd8e926d71e23c6a1f37':
2014-11-02 18:41:30 +00:00
Paul Westbrook 2ca250a9b7 am 47ee4637: resolved conflicts for merge of 19809304 to lmp-sprout-dev
* commit '47ee4637293ed77e9e03cc43c64ddc3cb1c6b525':
2014-11-02 18:36:49 +00: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
Tony Mantler c1ad14a93e am 8eca7d6a: am ee2a66b5: am 3fb948e4: am 800d544a: am 8c6a01f8: Remove app icon from Setup and Mailbox Settings
* commit '8eca7d6a5077754dbc3f1ec78506458a3384efb0':
  Remove app icon from Setup and Mailbox Settings
2014-11-02 17:50:43 +00:00
Tony Mantler 95d12ced49 am e46c6c10: am 685f2f1d: am 784b61cc: am 34a686ab: am dfb7fe91: Remove password spaces warning
* commit 'e46c6c10c02c8a6041b1c6d725abb262b570725f':
  Remove password spaces warning
2014-11-02 17:50:42 +00:00
Tony Mantler a3806ec48c am 31c4a2d0: am 47a2f0f7: am cd77bc1b: am 58310123: am 0ee42176: Merge "Fix spinners layout mangling" into ub-gmail-ur14-dev
* commit '31c4a2d0451f1467c96cdf89d4bd1f9ec8fcb266':
  Fix spinners layout mangling
2014-11-02 17:50:41 +00:00
Paul Westbrook fdfa501250 am 8969e378: am 54013128: am 091ed0db: am b4986725: am 6a07fc19: Merge "Remove unused resource" into ub-gmail-ur14-dev
* commit '8969e378d990adddb4652b05953276406c7dfd24':
  Remove unused resource
2014-11-02 17:50:40 +00:00
Martin Hibdon 0916e2dc5d am b0a19219: am 4113c904: am 2562a4df: am 61e79746: am c845295f: Merge "Fix the text of the authentication label on rotation" into ub-gmail-ur14-dev
* commit 'b0a1921985d46e9591e2687f0faf18306f6a868f':
  Fix the text of the authentication label on rotation
2014-11-02 17:50:39 +00:00
Andrew Sapperstein a2f4826db7 am 52b81bfe: am 0f493a86: am ec83f7fa: am 5b5d5585: am 86e17ba1: Merge "Set recents color for photoviewer. b/17389434" into ub-gmail-ur14-dev
* commit '52b81bfe5befb792b5b2c0245463088faf393ba8':
  Set recents color for photoviewer. b/17389434
2014-11-02 17:50:38 +00:00
James Lemieux 8ecf96eb82 am a341c92d: am 93d724aa: am 46f73c05: am 7266502c: am 3bdce9b5: Remove server-side sanitized HTML capability; add client-side santized HTML capability
* commit 'a341c92d59643b701f0c5b25ca9706891e4d423d':
  Remove server-side sanitized HTML capability; add client-side santized HTML capability
2014-11-02 17:50:37 +00:00
Tony Mantler c59b73474f am a59fce8e: am e62810f7: am ac26021d: am d50e207f: am 65669454: Set IME resize flag for AccountServerSettingsActivity
* commit 'a59fce8ebac2ad866efefe4d86ce6160546d1f2e':
  Set IME resize flag for AccountServerSettingsActivity
2014-11-02 17:50:36 +00:00
James Lemieux ccc15a7f47 am 386c3357: am 32a6138d: am 325afc41: am 04c77181: am 1be8b05b: The error message "This field can\'t be blank" can be ignored
* commit '386c33574c73f0abaad05fb137d20834ec99dc12':
  The error message "This field can't be blank" can be ignored
2014-11-02 17:50:35 +00:00
Baligh Uddin 5447fb433e am ec1fa677: (-s ours) am c7332f11: (-s ours) am dd454375: (-s ours) am 9ea9d245: (-s ours) am efb6cb25: (-s ours) Import translations. DO NOT MERGE
* commit 'ec1fa677bd240a529aed0ff80c9ae90562be7e1e':
  Import translations. DO NOT MERGE
2014-11-02 17:50:34 +00:00
Tony Mantler 65516fd9f2 am bcf42ff1: am 91232a21: am 39aa4910: am 882e1a89: am e068440f: Merge "Update search folder status in a finally block" into ub-gmail-ur14-dev
* commit 'bcf42ff14b1ccb8f86fa27a33878217c7f2a5333':
  Update search folder status in a finally block
2014-11-02 17:50:33 +00:00
Martin Hibdon e5f590518b am 2d488bf4: am 1db58a95: am 2569cfcb: am 2ff1a5cd: am e87b38fa: Merge "Prevent account reconcilliation during migration" into ub-gmail-ur14-dev
* commit '2d488bf43d30749269f5f01c35474ed6d7f98d05':
  Prevent account reconcilliation during migration
2014-11-02 17:50:32 +00:00