Commit Graph

13254 Commits

Author SHA1 Message Date
Baligh Uddin
fb620b36b1 am 4f1a919b: (-s ours) Import translations. DO NOT MERGE
* commit '4f1a919b719cdcc1cb664ddfd2d404c366283014':
  Import translations. DO NOT MERGE
2014-07-06 21:47:07 +00:00
Baligh Uddin
0a74d7f0cc am 6012ef62: (-s ours) Import translations. DO NOT MERGE
* commit '6012ef625f045a74853d6b347bf9664d81646294':
  Import translations. DO NOT MERGE
2014-07-06 21:46:46 +00:00
Baligh Uddin
f642501133 am 7611e3f7: (-s ours) Import translations. DO NOT MERGE
* commit '7611e3f7d42c2259cd08180a58eb99f7fb259069':
  Import translations. DO NOT MERGE
2014-07-06 21:46:41 +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
acdf3d73df am f7e522a9: (-s ours) Import translations. DO NOT MERGE
* commit 'f7e522a9c45862d78235c6e37f40f23fe509cce8':
  Import translations. DO NOT MERGE
2014-07-06 21:46:22 +00:00
Baligh Uddin
92a5b634ab Import translations. DO NOT MERGE
Change-Id: I100693f4f816c7cc078d6cbbd8c01a2c074b2380
Auto-generated-cl: translation import
2014-07-06 11:17:13 -07:00
Baligh Uddin
6012ef625f Import translations. DO NOT MERGE
Change-Id: Ief526b490061041c7169bb21455b53a4ff1980de
Auto-generated-cl: translation import
2014-07-06 11:11:08 -07:00
Baligh Uddin
4f1a919b71 Import translations. DO NOT MERGE
Change-Id: If287cbf4fada41b357a7be08d6aafd481b9214f8
Auto-generated-cl: translation import
2014-07-06 11:09:22 -07:00
Baligh Uddin
7611e3f7d4 Import translations. DO NOT MERGE
Change-Id: I3a6236310bff9f1f82d84e12322f5816a1a40b69
Auto-generated-cl: translation import
2014-07-06 11:07:47 -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
f7e522a9c4 Import translations. DO NOT MERGE
Change-Id: I23672a3e3ee1657c6b96fd492bdc16800e2900da
Auto-generated-cl: translation import
2014-07-06 10:53:05 -07: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
79f485a9a6 Import translations. DO NOT MERGE
Change-Id: I5d36b89f02b11744ec5373d9b672f7fa8106c62f
Auto-generated-cl: translation import
2014-07-06 11:06:16 -07:00
Andrew Sapperstein
c07a442403 quantum change labels b/16054906
Change-Id: I0b8a639ccb76f2945e3839b10d59cf646d168e57
2014-07-03 18:28:01 -07:00
Martin Hibdon
2d90fbd2e8 Merge "Update version" into ub-mail-master 2014-07-02 20:11:01 +00:00
Martin Hibdon
b6795c55f9 Update version
Change-Id: I1d39d6e2f3edbc9af63bc1ced1ac1c48210e8f3f
2014-07-02 14:42:14 -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
The Android Automerger
cfd9b05301 merge in ub-mail-master-release history after reset to 035f5fd71c 2014-06-30 20:00:19 -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
Tony Mantler
3c5af60cc2 Merge "Override archive/delete behavior" into ub-mail-master 2014-06-27 16:52:20 +00:00
Andrew Sapperstein
99e836097b Fix build.
Change-Id: Ie51274cb9eaf154dfc41c86b40845028b0993610
2014-06-29 19:42:29 -07:00
Tony Mantler
04a621aa2c Override archive/delete behavior
b/15935182

Change-Id: I36210535dacc796a1dbaaabd5e16434e88e556db
2014-06-27 14:20:58 -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
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
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
45f71c51a9 Merge "Import translations. DO NOT MERGE" 2014-06-26 23:44:51 +00:00
Baligh Uddin
47abe88ce3 Import translations. DO NOT MERGE
Change-Id: I619cb06f98603fabd5f27ef37c2ad3526d0cd537
Auto-generated-cl: translation import
2014-06-26 14:55:54 -07:00
Tony Mantler
9a311806ca Merge "Change SENDING_UNAVAILABLE to VIRTUAL_ACCOUNT" into ub-mail-master 2014-06-26 17:57:04 +00:00
Tony Mantler
c2b1056a61 Change SENDING_UNAVAILABLE to VIRTUAL_ACCOUNT
b/9566150

Change-Id: Ic8c009d2440eb2f4b2cd6343b50118b81d636fb6
2014-06-26 14:21:26 -07:00
Baligh Uddin
89ef14d6aa am 83873fcc: (-s ours) am 06f8a6b0: (-s ours) Import translations. DO NOT MERGE
* commit '83873fcc4f15aef14ca68affe3b550042ba24eaa':
  Import translations. DO NOT MERGE
2014-06-26 16:59:51 +00:00
Baligh Uddin
83873fcc4f am 06f8a6b0: (-s ours) Import translations. DO NOT MERGE
* commit '06f8a6b042221f9ebe370e0a72f0462d7eb1be51':
  Import translations. DO NOT MERGE
2014-06-26 16:54:24 +00:00
Régis Décamps
5026028300 Refactor how the warm welcome is triggered.
MailActivityEmail doesn't need to implement WelcomeTourCompletionListener anymore.

b/15705426

Change-Id: I911eb8eac6e6759448065e68e85d6f347693ea82
2014-06-26 10:19:53 +02:00
Baligh Uddin
06f8a6b042 Import translations. DO NOT MERGE
Change-Id: I6046e493c8fe6ec54610b5b33bc12771a59df3f2
Auto-generated-cl: translation import
2014-06-25 11:23:35 -07:00
Anthony Lee
3d16e5d4b9 Move over to the new AttachmentService.
Change-Id: I4a687b003884ea6a92a755fcbf394001bfc96a38
2014-06-25 09:56:29 -07:00
Anthony Lee
ff52eef8e6 Revamp logging & remove the threading around downloads.
There is no need to launch a new AsyncTask around adding an
attachment to the queue of downloads. We can restore the attachment
in the worker thread of AttachmentService instead. Also reworked
the logging so we can trace the flow of the AttachmentService if
we need to debug again in the future.

Change-Id: I368ebb4322bc0af0f4cadedf102959d621e5ee80
2014-06-24 15:24:47 -07:00
Martin Hibdon
d5ca90b056 Add high and medium density delete icons.
b/15749214

Change-Id: Ifc62e590b679d65c59ba08666fd0dd18a4d1fd10
2014-06-24 14:18:03 -07:00
Jay Shrauner
5bcb36eb10 Fix NPE from null Folder
Catch empty folder cursor in migrate() and log error message and
continue as with other empty cursor handling in loop.

Bug:15854046
Change-Id: I13c0a1909755f62f318d7c2b237adb03df68ba86
2014-06-24 10:40:47 -07:00
The Android Automerger
6d26aaf251 merge in ub-mail-master-release history after reset to 5f24f6f2e5 2014-06-23 20:00:17 -07:00
Tony Mantler
5f24f6f2e5 Merge "Return settings fragment class for account" into ub-mail-master 2014-06-23 21:44:43 +00:00
Jay Shrauner
5417166477 Merge "Fix NPE in onBasicsComplete" into ub-mail-master 2014-06-23 21:44:43 +00:00