Commit Graph

13131 Commits

Author SHA1 Message Date
Baligh Uddin
284b6bf9d0 am bf96e543: keep history after reset to ub-mail-master-release
* commit 'bf96e543517fa453d694d8fde7eed65d5b40c6da':
2014-07-16 19:18:02 +00:00
The Android Automerger
56391f6375 am 5a9c5750: merge in ub-mail-master-release history after reset to 5c93d36616
* commit '5a9c5750bc1221c01846470411abd56f58b39914':
  Upgrade my logging from .e to .wtf
  Add logging to help track down a bug causing invalid credentials
  Increase touch target for adding authentication
  Fix a NPE trying to download an attachment
  Actually install the correct views when credentials fragment is in standalone mode
  Update Email major version number to 6.3 so that it matches EmailGoogle
  Update version
  Fix temporary setup flow on tablets
  Fix a crash bringing up settings
2014-07-16 19:18:00 +00:00
Jay Shrauner
fc1eecd7a8 am 5c93d366: Merge "Fix NPE in uiSaveDraftMessage" into ub-mail-master
* commit '5c93d3661603843d6bc0b9084a2633c7e3d08ab9':
  Fix NPE in uiSaveDraftMessage
2014-07-16 19:18:00 +00:00
Martin Hibdon
354a881f65 am 1fa51773: Merge "Add copyright notice" into ub-mail-master
* commit '1fa51773bf50fc9a8cb3ee55eeab8e9aec7694b3':
  Add copyright notice
2014-07-16 19:17:59 +00:00
James Lemieux
68f02dec16 am 0e7a8dbe: Merge "Replace all references to UnifiedEmail\'s com.android.oldbitmap with equivalent usage of framework\'s com.android.bitmap." into ub-mail-master
* commit '0e7a8dbed85da44acf8c2646f59e328c03ae248f':
  Replace all references to UnifiedEmail's com.android.oldbitmap with equivalent usage of framework's com.android.bitmap.
2014-07-16 19:17:58 +00:00
Tony Mantler
237bdba9c8 am 8f5ca5a7: Rename AccountSettings to EmailPreferenceActivity
* commit '8f5ca5a790c4c05dd4ee6a8c769ff9817f40123b':
  Rename AccountSettings to EmailPreferenceActivity
2014-07-16 19:17:57 +00:00
Martin Hibdon
af0554fcb9 am bb391e80: Merge "Update IEmailService" into ub-mail-master
* commit 'bb391e8018a56f27bb2025accf5171491e4b2a14':
  Update IEmailService
2014-07-16 19:17:56 +00:00
Tony Mantler
661fa10a96 am 6cf6b5c2: Merge "Remove direct entry points to AccountSettings" into ub-mail-master
* commit '6cf6b5c2921e3dacf389d11f17971742d03e2ad3':
  Remove direct entry points to AccountSettings
2014-07-16 19:17:54 +00:00
James Lemieux
bc0cced076 am f79ed0f5: Merge "Remove attachment previews from Conversation List" into ub-mail-master
* commit 'f79ed0f54fb0cf8ec081d72ccaffdaf18fd7e0dd':
  Remove attachment previews from Conversation List
2014-07-16 19:17:54 +00:00
Tony Mantler
27759dc7d8 am 436a0bde: Merge "Add support for UPDATE_SETTINGS_URI" into ub-mail-master
* commit '436a0bdee550069322013b82c6dcb2edf11cca5f':
  Add support for UPDATE_SETTINGS_URI
2014-07-16 19:17:53 +00:00
Milos Stankovic
c3f7ecdc99 am 4fb48202: Moving Previous, Next and Done strings to UnifiedEmail.
* commit '4fb4820223b2b98b2a8517c9231950c0740cb15c':
  Moving Previous, Next and Done strings to UnifiedEmail.
2014-07-16 19:17:52 +00:00
Régis Décamps
00ea75cda1 am c3404cca: Better documentation for "Account display name".
* commit 'c3404cca71b3451e0bf79afe2abca45522738873':
  Better documentation for "Account display name".
2014-07-16 19:17:51 +00:00
Tony Mantler
299aac4a24 am f90dbc83: Strings aren\'t Integers
* commit 'f90dbc83e2853717a3470f8e530a8a7e1c58b2e6':
  Strings aren't Integers
2014-07-16 19:17:50 +00:00
Tony Mantler
f836f8d0b7 am 4fb5412e: Switch to material icons for Email
* commit '4fb5412e1b3a4fad45eed90c7040b6ff0fe323b8':
  Switch to material icons for Email
2014-07-16 19:17:49 +00:00
Tony Mantler
6b8902c078 am 6c15188a: Merge "Close body input streams" into ub-mail-master
* commit '6c15188a9ec334e0c1ea892852060b8360926300':
  Close body input streams
2014-07-16 19:17:48 +00:00
Martin Hibdon
1595aa33ea am 1d8fd9c0: Add communication class for HostAuth
* commit '1d8fd9c05449863ac6a151a6db87c267c4f55ac2':
  Add communication class for HostAuth
2014-07-16 19:17:47 +00:00
Baligh Uddin
2debaaa2b9 am c11f7b90: (-s ours) am f6425011: (-s ours) am 7611e3f7: (-s ours) Import translations. DO NOT MERGE
* commit 'c11f7b9027d5e2ac64b0ebe59387e39ff000cbbc':
  Import translations. DO NOT MERGE
2014-07-16 19:17:46 +00:00
Baligh Uddin
555c3df899 am fb620b36: (-s ours) am 4f1a919b: (-s ours) Import translations. DO NOT MERGE
* commit 'fb620b36b169cb3686cb31d7b7374b2ba6c46e49':
  Import translations. DO NOT MERGE
2014-07-16 19:17:45 +00:00
Baligh Uddin
39aa9d02c9 am 0a74d7f0: (-s ours) am 6012ef62: (-s ours) Import translations. DO NOT MERGE
* commit '0a74d7f0ccbe216626b276e89a64faa12a404375':
  Import translations. DO NOT MERGE
2014-07-16 19:17:44 +00:00
Baligh Uddin
620b6e3c6f am acdf3d73: (-s ours) am f7e522a9: (-s ours) Import translations. DO NOT MERGE
* commit 'acdf3d73df84ba588258deb462f270b546291405':
  Import translations. DO NOT MERGE
2014-07-16 19:17:43 +00:00
Baligh Uddin
3259e209ca am 92a5b634: (-s ours) Import translations. DO NOT MERGE
* commit '92a5b634ab7744652073a3cfc589e44a1ce60041':
  Import translations. DO NOT MERGE
2014-07-16 19:17:42 +00:00
Andrew Sapperstein
6fdff09aeb am c07a4424: quantum change labels b/16054906
* commit 'c07a44240311eb0ce44654284b010e6df8b08e86':
  quantum change labels b/16054906
2014-07-16 19:17:41 +00:00
Martin Hibdon
d0bb4c7491 am 2d90fbd2: Merge "Update version" into ub-mail-master
* commit '2d90fbd2e8d257afc62c8b555805bcaa0ad79410':
  Update version
2014-07-16 19:17:40 +00:00
Andrew Sapperstein
8dbe159460 am 9fc5b8d8: Fix build.
* commit '9fc5b8d80dcd98183efd4c8c4bf4f95ecaccac33':
  Fix build.
2014-07-16 19:17:38 +00:00
Tony Mantler
b9fc3a4ec3 am 035f5fd7: Delete obsolete emailsync code
* commit '035f5fd71c071a1acafbb904f9edf5b04318fd4a':
  Delete obsolete emailsync code
2014-07-16 19:17:37 +00:00
Tony Mantler
4c05ebad20 am e292027f: Pre-cache attachment content URIs
* commit 'e292027fa7ec3f7d12aa7228d2c62b7c863581be':
  Pre-cache attachment content URIs
2014-07-16 19:17:36 +00:00
Tony Mantler
9e41e4edd3 am 3c5af60c: Merge "Override archive/delete behavior" into ub-mail-master
* commit '3c5af60cc2eeaa3d8e2c65b5db62602eda6d8a2f':
  Override archive/delete behavior
2014-07-16 19:17:35 +00:00
Andrew Sapperstein
2c04d137f1 am 99e83609: Fix build.
* commit '99e836097bf0e21aef588b747ec06baae999f288':
  Fix build.
2014-07-16 19:17:29 +00:00
Tony Mantler
67c8c0495c am bed71e61: Add override for Email general prefs header
* commit 'bed71e61c779a5b617fbc0d2fc80c956af709e73':
  Add override for Email general prefs header
2014-07-16 19:17:28 +00:00
Tony Mantler
985ebec9fa am 88580cd5: Merge "Unify settings activity" into ub-mail-master
* commit '88580cd5e04bd21a5a87ad4702a728ebbb57618c':
  Unify settings activity
2014-07-16 19:17:27 +00:00
Tony Mantler
b243193681 am 9a311806: Merge "Change SENDING_UNAVAILABLE to VIRTUAL_ACCOUNT" into ub-mail-master
* commit '9a311806cab6e70c960a26a0207d44a6c01ccac9':
  Change SENDING_UNAVAILABLE to VIRTUAL_ACCOUNT
2014-07-16 19:17:26 +00:00
Régis Décamps
bd13662ecc am 50260283: Refactor how the warm welcome is triggered.
* commit '50260283001d23e1988f369e84514f2c43732ec5':
  Refactor how the warm welcome is triggered.
2014-07-16 19:17:25 +00:00
Anthony Lee
969f41ba2b am 3d16e5d4: Move over to the new AttachmentService.
* commit '3d16e5d4b994d92db51962c8c461c53bee04309f':
  Move over to the new AttachmentService.
2014-07-16 19:17:24 +00:00
Anthony Lee
f965c41375 am ff52eef8: Revamp logging & remove the threading around downloads.
* commit 'ff52eef8e691645e657f02a21c9d51968c2bdcfd':
  Revamp logging & remove the threading around downloads.
2014-07-16 19:17:23 +00:00
Jay Shrauner
3ce46d4785 am 5bcb36eb: Fix NPE from null Folder
* commit '5bcb36eb10c896c07b873fcbbab2610cfca58e5f':
  Fix NPE from null Folder
2014-07-16 19:17:22 +00:00
Tony Mantler
587ce2e0e2 am 5f24f6f2: Merge "Return settings fragment class for account" into ub-mail-master
* commit '5f24f6f2e5a2210d2b4c4c60da4b8dcf585dc3b8':
  Return settings fragment class for account
2014-07-16 19:17:21 +00:00
Jay Shrauner
a5acc2fa0f am 54171664: Merge "Fix NPE in onBasicsComplete" into ub-mail-master
* commit '541716647792126cab09bdef0d4c01eed982a62b':
  Fix NPE in onBasicsComplete
2014-07-16 19:17:20 +00:00
Jay Shrauner
c3dabb5230 am 9adf186c: Catch negative literal sizes in imap responses
* commit '9adf186c5b6843b72d6768e4604768f39abe8467':
  Catch negative literal sizes in imap responses
2014-07-16 19:17:20 +00:00
Tony Mantler
b93422d167 am 2eecdd1a: Don\'t leak cursors
* commit '2eecdd1a50676eaae98b75d1d74de697cff39dd7':
  Don't leak cursors
2014-07-16 19:17:19 +00:00
Paul Westbrook
078ac6e4ca am c24d5d4f: Merge "Enable supression of combined account" into ub-mail-master
* commit 'c24d5d4f1973fc300876cc5053aa50b4e92fb856':
  Enable supression of combined account
2014-07-16 19:17:18 +00:00
Tony Mantler
8343e3d5b8 am 7b9f7ff7: Make AccountSettings subclass MailPreferenceActivity
* commit '7b9f7ff76fd9812d7e3ae4dd42c1ba97b6e347e7':
  Make AccountSettings subclass MailPreferenceActivity
2014-07-16 19:17:17 +00:00
Martin Hibdon
0ee5acebd1 am b63b39d0: am 9c0463e6: Don\'t offer oauth unless we have at least one provider
* commit 'b63b39d03e2b1f5ea3998459d1ba96124316d907':
  Don't offer oauth unless we have at least one provider
2014-07-16 19:17:16 +00:00
Martin Hibdon
9283ef1998 am 9e9aaa64: Merge "Update IEmailService" into ub-mail-master
* commit '9e9aaa642c1a131f9d03e20bf48ff8fd8ba9d2bd':
  Update IEmailService
2014-07-16 19:17:15 +00:00
James Lemieux
6641773bde am bf0022da: Merge "Add UX assets for the Material-compatible search icon" into ub-mail-master
* commit 'bf0022da5082956fed772b20e702fc9672a6ab76':
  Add UX assets for the Material-compatible search icon
2014-07-16 19:17:14 +00:00
Tony Mantler
c9480bef94 am 6f747eb7: Unify general settings
* commit '6f747eb77616d7f9949997d7e5a47414534a355a':
  Unify general settings
2014-07-16 19:17:14 +00:00
Anthony Lee
9528508399 am 2a5dac19: Remove the wearable prebuilt from the Email makefile
* commit '2a5dac19e7d1f398d0b1b7b22055b2a65a072c46':
  Remove the wearable prebuilt from the Email makefile
2014-07-16 19:17:13 +00:00
Paul Westbrook
18ffb4a2c4 am e817be13: Specify compose activity with resource.
* commit 'e817be135332c4060b5985ff830e3ce555043a43':
  Specify compose activity with resource.
2014-07-16 19:17:12 +00:00
Paul Westbrook
4713567c1a am 57dbc3bf: Remove proguard config for removed class
* commit '57dbc3bf028008f9d23c2caa7908bcf4f4bfb3f7':
  Remove proguard config for removed class
2014-07-16 19:17:11 +00:00
Baligh Uddin
bf96e54351 keep history after reset to ub-mail-master-release 2014-07-16 12:07:45 -07:00
The Android Automerger
5a9c5750bc merge in ub-mail-master-release history after reset to 5c93d36616 2014-07-14 20:00:18 -07:00