Commit Graph

13033 Commits

Author SHA1 Message Date
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
cca7fdf862 Merge "Fix submitted - retrying." 2014-07-06 02:28:07 +00:00
Baligh Uddin
94f3febce1 Fix submitted - retrying.
Revert "Broke the build."

This reverts commit a4a1319cf3.

Change-Id: Ic3fb982da84b9dde34e550efaaf67450c1f460d2
2014-07-07 03:07:46 +00:00
Andrew Sapperstein
373e846d29 Fix build.
Change-Id: Ie51274cb9eaf154dfc41c86b40845028b0993610
(cherry picked from commit 99e836097b)
2014-07-07 03:02:39 +00:00
Baligh Uddin
96475ad940 am 8c0c1c0e: (-s ours) am ab8aa373: (-s ours) am c6e040c7: (-s ours) am 19019ae6: (-s ours) Import translations. DO NOT MERGE
* commit '8c0c1c0ed6aadc4c8179e748c7d171138fd3ffc9':
  Import translations. DO NOT MERGE
2014-07-06 22:04:00 +00:00
Baligh Uddin
a4a1319cf3 Broke the build.
Revert "Import translations. DO NOT MERGE"

This reverts commit 79f485a9a6.

Change-Id: Ibf35a432958a5bad17a8668ee8a51cc5b0ed84a4
2014-07-06 22:02:03 +00:00
Baligh Uddin
8c0c1c0ed6 am ab8aa373: (-s ours) am c6e040c7: (-s ours) am 19019ae6: (-s ours) Import translations. DO NOT MERGE
* commit 'ab8aa37396f9d8f855aa3b7a52db0f828528e03b':
  Import translations. DO NOT MERGE
2014-07-06 21:57:18 +00:00
Baligh Uddin
ab8aa37396 am c6e040c7: (-s ours) am 19019ae6: (-s ours) Import translations. DO NOT MERGE
* commit 'c6e040c7beb2df51cf63e91b7a3eef9888900ec5':
  Import translations. DO NOT MERGE
2014-07-06 21:52:46 +00:00
Baligh Uddin
2999eed5f8 am a6cb9375: (-s ours) Import translations. DO NOT MERGE
* commit 'a6cb9375f5bca73a9aa70957aa0687ee02ef2ecd':
  Import translations. DO NOT MERGE
2014-07-06 21:49:27 +00:00
Baligh Uddin
c6e040c7be am 19019ae6: (-s ours) Import translations. DO NOT MERGE
* commit '19019ae6942121ed33203b2e355730af08f7c31e':
  Import translations. DO NOT MERGE
2014-07-06 21:46:35 +00:00
Baligh Uddin
79f485a9a6 Import translations. DO NOT MERGE
Change-Id: I5d36b89f02b11744ec5373d9b672f7fa8106c62f
Auto-generated-cl: translation import
2014-07-06 11:06:16 -07:00
Baligh Uddin
a6cb9375f5 Import translations. DO NOT MERGE
Change-Id: Id6669b5dc0915b838273ac47c57b13db88f8c7e6
Auto-generated-cl: translation import
2014-07-06 10:57:46 -07:00
Baligh Uddin
19019ae694 Import translations. DO NOT MERGE
Change-Id: I97a1fb94befee6929e63648440a67518c4bc82bb
Auto-generated-cl: translation import
2014-07-06 10:56:15 -07:00
Baligh Uddin
61b5b3edbc Merge "Broke the build." 2014-07-02 18:17:00 +00:00
Baligh Uddin
72522b5461 am 2999eed5: (-s ours) am a6cb9375: (-s ours) Import translations. DO NOT MERGE
* commit '2999eed5f8d6c7ca1775d06dc2f52ceff9211640':
  Import translations. DO NOT MERGE
2014-07-06 21:56:07 +00:00
Andrew Sapperstein
9fc5b8d80d Fix build.
Change-Id: I3c84b1ccb2171672857f523ed636de456fa7313a
2014-07-01 16:45:31 -07:00
Tony Mantler
035f5fd71c Delete obsolete emailsync code
b/5784532

Change-Id: I33a693e91b99253c4f82758c875c8cf21bace543
2014-06-30 13:13:00 -07:00
Tony Mantler
e292027fa7 Pre-cache attachment content URIs
Saves us a DB read on the UI thread.

b/15939030

Change-Id: I1b8174880ccc9dc06df6b57df2bd8d44a2fe05d4
2014-06-30 10:24:12 -07:00
Andrew Sapperstein
99e836097b Fix build.
Change-Id: Ie51274cb9eaf154dfc41c86b40845028b0993610
2014-06-29 19:42:29 -07:00
Tony Mantler
bed71e61c7 Add override for Email general prefs header
Diverts to a fragment that excludes archive-based actions

b/15935182

Change-Id: Ic17195d15fedafc6f5fd9b95da1c08f1b563c27c
2014-06-27 13:52:42 -07:00
Tony Mantler
3c5af60cc2 Merge "Override archive/delete behavior" into ub-mail-master 2014-06-27 16:52:20 +00:00
Tony Mantler
04a621aa2c Override archive/delete behavior
b/15935182

Change-Id: I36210535dacc796a1dbaaabd5e16434e88e556db
2014-06-27 14:20:58 -07:00
Tony Mantler
88580cd5e0 Merge "Unify settings activity" into ub-mail-master 2014-06-27 15:56:14 +00:00
Tony Mantler
06415a635f Unify settings activity
b/9566150

- Install PublicPreferenceActivity
- Create AccountServerSettingsActivity to contain all the crazy
    logic we don't want in AccountSettings
- Add restoreAccountWithAddress to Account
- Refactor almost everything out of AccountSettings
- Tidy the QuickResponse fragment
- Majorly refactor the AccountSettingsFragment to decouple it from
    the activity, and make it save settings immediately instead of
    when pausing
- Move login warning dialog to AccountSettingsFragment
- Tweak HeadlessAccountSettingsLoader

Change-Id: Ie69181d968b9c3e5940cfef9690b1f5c70e21aa8
2014-06-27 10:49:18 -07:00
Baligh Uddin
37139ea828 Merge "Lovely - broke the build. Ugh !" 2014-06-27 15:56:14 +00:00
Baligh Uddin
609842f201 Lovely - broke the build. Ugh !
Revert "Import translations. DO NOT MERGE"

This reverts commit 47abe88ce3.

Change-Id: If1944271f1a2b5249ec0cdf02294cd56544dd81a
2014-06-28 04:33:53 +00:00