Commit Graph

13170 Commits

Author SHA1 Message Date
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
Ray Chen
7e75afadb1 com.android.mail.providers.Account contructors are no longer public
and clients need to use Account.builder().buildFrom(...) instead.

Change-Id: I7559540458ae549c399effc59392930ec914ffcc
2014-07-16 10:06:23 +02:00
Paul Westbrook
0b060097ed Merge "Use the prebuilt support library resources" into ub-mail-master 2014-07-16 01:00:53 +00:00
Paul Westbrook
f1212d4181 Use the prebuilt support library resources
Change-Id: I70853b5a73aa98e806adffdfceeb365f3949daa0
2014-07-16 11:46:01 +02:00
Tony Mantler
46c95eb6c9 Add new account intent is no longer forwarding
It now launches directly instead of bouncing through settings

b/16309940

Change-Id: I23ab9902f3b02e466626e08b842a5228193a7909
2014-07-15 09:56:55 -07:00
James Lemieux
2a70971689 Merge "Marking conversations read/unread in the TL removes the snippet text" into ub-mail-master 2014-07-15 16:06:25 +00:00
James Lemieux
b4a9c1e302 Marking conversations read/unread in the TL removes the snippet text
b/16322573

EmailConversationCursor was not populating the firstUnreadSnippet and
lastSnippet values in ConversationInfo. When they remain null and are
subsequently set as the snippet text, it effectively removes the snippet.

Change-Id: I1c17508bbc8857d00d8678dca4a7ad791dcae049
2014-07-15 12:39:21 -07:00
Tony Mantler
845001d250 Merge "Add "Add Account" to prefs headers" into ub-mail-master 2014-07-15 16:04:58 +00:00
Tony Mantler
9ccae204cf Merge "Make quick response UI in settings toggleable" into ub-mail-master 2014-07-15 16:04:58 +00:00
Tony Mantler
e9e2a21d87 Make quick response UI in settings toggleable
b/16302932

Change-Id: I24b289ffbecd4f127e6109b56c0af7f9c4b00879
2014-07-15 10:31:18 -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
Tony Mantler
1dcdc09e03 Add "Add Account" to prefs headers
Borrowed + icon from authentication widget

b/16298155

Change-Id: I36d0eb2c7b9e98442d72481254d9a4da2ae3c999
2014-07-14 14:33:32 -07:00
Tony Mantler
8f5ca5a790 Rename AccountSettings to EmailPreferenceActivity
Change-Id: I972cdae394081b5ec028c38b9274e64ef5822d4a
2014-07-14 11:44:52 -07:00
Martin Hibdon
1fa51773bf Merge "Add copyright notice" into ub-mail-master 2014-07-14 18:38:08 +00:00
Martin Hibdon
30a5e1d461 Add copyright notice
Change-Id: I80e074196ca8cb6962d400a756c510c8e3105899
2014-07-14 12:10:20 -07:00
Jay Shrauner
5c93d36616 Merge "Fix NPE in uiSaveDraftMessage" into ub-mail-master 2014-07-14 18:38:02 +00:00
James Lemieux
0e7a8dbed8 Merge "Replace all references to UnifiedEmail's com.android.oldbitmap with equivalent usage of framework's com.android.bitmap." into ub-mail-master 2014-07-14 18:38:02 +00:00
Jay Shrauner
bcc204dd6f Fix NPE in uiSaveDraftMessage
Verify that restoreMessageWithId returns a non-null result.

Bug:14655866
Change-Id: Ia48d5fd96a4314f4e10e9a8c3764ad52f2aa5eed
2014-07-14 10:51:00 -07:00
Martin Hibdon
bb391e8018 Merge "Update IEmailService" into ub-mail-master 2014-07-14 17:08:38 +00:00
Tony Mantler
6cf6b5c292 Merge "Remove direct entry points to AccountSettings" into ub-mail-master 2014-07-14 16:02:26 +00:00
Martin Hibdon
7afbeee47e Update IEmailService
Add version support
Change deleteAccountPIMData to deleteExternalAccountPIMData.
Data kept inside the EmailProvider can be deleted from within
the Email app. Only external data (e.g. contacts and calendar)
need to be deleted by the service which has protocol specific
knowlege.

Change-Id: I875d3051d0cfdbaf52775ec20eb114a345894a93
2014-07-11 15:49:45 -07:00
Tony Mantler
8c03e2af9f Remove direct entry points to AccountSettings
b/16240332

Change-Id: I9bc3f9a2e0b7faa4d8875a9ac7d6d585a65d9733
2014-07-11 21:34:55 +00:00
James Lemieux
89febdfc3b Replace all references to UnifiedEmail's com.android.oldbitmap with
equivalent usage of framework's com.android.bitmap.

A small refactor of AccountAvatarDrawable.drawBitmap(...) is also included
which produces no functional change.

Change-Id: I223e71a31ada0d9ffb2e4f0458fa1703338ac622
2014-07-11 14:24:42 -07:00