Commit Graph

13165 Commits

Author SHA1 Message Date
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
Jay Shrauner
9adf186c5b Catch negative literal sizes in imap responses
Check for negative sizes for literals so that we don't crash attempting
to create a negative sized array.

Bug:15834346
Change-Id: I1fbd9b86c807f1e97100fbfe52ef402a337bf655
2014-06-23 14:55:30 -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
Jay Shrauner
73a561fbbd Fix NPE in onBasicsComplete
Check for null mExistingAccountsMap as is done in finishAutoSetup().

Bug:15835752
Change-Id: I9e01d36990e107dc2c89f345c5e6f4565f071913
2014-06-23 15:10:11 -07:00
Tony Mantler
2eecdd1a50 Don't leak cursors
b/15830514

Change-Id: I91f452fc7c14a076d7f9078ec066215b28ddc3c3
2014-06-23 13:38:22 -07:00
Tony Mantler
876c8e1408 Return settings fragment class for account
b/9566150

Change-Id: Ia88f09d651284ff8f25a1784dc9a93ee30e6ea52
2014-06-20 14:32:15 -07:00
Paul Westbrook
c24d5d4f19 Merge "Enable supression of combined account" into ub-mail-master 2014-06-20 02:15:46 +00:00
Paul Westbrook
4038f464de Enable supression of combined account
This enables the client of the provider to suppress the email combined
account.  Later, the UI can enable a combined account that spans all of
the account types

Change-Id: I77e201f751019240af2274a1f74e2124b9889aab
2014-06-20 00:09:07 -07:00
Tony Mantler
7b9f7ff76f Make AccountSettings subclass MailPreferenceActivity
b/9566150

Change-Id: I62e0115f11761f9019a1f1ecf96de82bbbb80c3a
2014-06-19 16:01:11 -07:00
Martin Hibdon
b63b39d03e am 9c0463e6: Don\'t offer oauth unless we have at least one provider
* commit '9c0463e6b485b3b50d9c6f110a9ece650cd4a692':
  Don't offer oauth unless we have at least one provider
2014-06-19 21:46:59 +00:00
Martin Hibdon
9c0463e6b4 Don't offer oauth unless we have at least one provider
In the AOSP version of the email app, we don't by default
have any oauth providers. We should not display option
to set up your account with OAuth.

Change-Id: I6fc55ae4852ec76b7c34c09ac58a0e06e89affa7
2014-06-19 13:28:06 -07:00
Android Git Automerger
028537ae04 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Email 2014-06-19 20:02:34 +00:00
Martin Hibdon
dfb7488d65 Update IEmailService
This is not yet finalized, but it's needed to fix push syncs
on exchange.

Change-Id: Iaff20aa0bdea9685ef6603de1f861d58fbab6ff1
(cherry picked from commit fb2a3a2f77)
2014-06-18 23:35:34 +00:00
Martin Hibdon
9e9aaa642c Merge "Update IEmailService" into ub-mail-master 2014-06-18 19:24:54 +00:00
Martin Hibdon
fb2a3a2f77 Update IEmailService
This is not yet finalized, but it's needed to fix push syncs
on exchange.

Change-Id: Iaff20aa0bdea9685ef6603de1f861d58fbab6ff1
2014-06-18 14:19:34 -07:00
James Lemieux
bf0022da50 Merge "Add UX assets for the Material-compatible search icon" into ub-mail-master 2014-06-17 20:55:27 +00:00
James Lemieux
f084903f3b Add UX assets for the Material-compatible search icon
Note that ic_menu_search_holo_light.png is renamed to ic_menu_search.png
as a byproduct of this change. It is then overlayed in -v21 folders so the
new icon only applies to L and beyond.

Change-Id: I97aaf1777d84b0e7df799044996ba99029b1798e
2014-06-17 13:41:20 -07:00
Tony Mantler
6f747eb776 Unify general settings
Make Email GeneralPreferences subclass GeneralPrefsFragment.

Only contains a minimum of code to strip out archive-related prefs,
which are not relevant to the current state of Email back-ends.

(These actions could be relevant for Gmail IMAP extensions if support is added for them)

b/9566150

Change-Id: Ie8e26379ed504c7d96c2a2f8e1c843bbe0582cc7
2014-06-17 13:24:20 -07:00
Anthony Lee
326566c9d9 Remove the wearable prebuilt from the Email makefile
Change-Id: Ic11c3e0b5d3f8b733d0427460a124a7a73101db3
(cherry picked from commit 2a5dac19e7)
2014-06-17 20:01:54 +00:00
Anthony Lee
2a5dac19e7 Remove the wearable prebuilt from the Email makefile
Change-Id: Ic11c3e0b5d3f8b733d0427460a124a7a73101db3
2014-06-17 11:01:22 -07:00
Paul Westbrook
e817be1353 Specify compose activity with resource.
Allow the compose activity, that the account reconciler attempts
to enabled/disable, to be able to be specified via resources.

This allows the various build targets to change the activity that is
enabled/disabled, or to not attempt to do this at all

Change-Id: I7c91c2c179316a3aac910a38d7dd0025076b085a
2014-06-17 15:47:33 +02:00
Geoff Mendal
25a214858a Keep history after reset to ub-mail-master 2014-06-17 05:58:23 -07:00
Paul Westbrook
57dbc3bf02 Remove proguard config for removed class
Change-Id: Ic926aa18d6d8a889c20c7f850a200774188ad422
2014-06-17 01:37:43 -07:00
The Android Automerger
0f99357dbf merge in ub-mail-master-release history after reset to 93ec28ec41 2014-06-16 20:00:14 -07:00
Andy Huang
28543e99ab doc-centric compose
use 'intoExisting' so repeated taps on Reply for a particular message
goes right to any in-progress compose.
use 'autoRemoveFromRecents' because nobody wants stale Compose tasks
accessible from Recents.

Change-Id: Icb39b504f51d20c8c2a11105c1af7a8b371234c4
2014-06-16 17:32:56 -07:00
Greg Bullock
b71fe22a93 Null implemention of the getWelcomeTourFragment method for Email.
Change-Id: I6e2e0917b70953f58aeed019066db118ca46fe70
2014-06-16 21:01:27 +02:00
Tony Mantler
93ec28ec41 Merge "Listen for relevant shared preferences changes" into ub-mail-master 2014-06-16 15:39:47 +00:00
Tony Mantler
c8d8a8445e Listen for relevant shared preferences changes
b/9566150

Change-Id: If6005de568330d12e2838220b815467d58276d71
2014-06-16 13:30:25 -07:00
Geoff Mendal
14b7357c48 Empty commit to fix Launchcontrol 2014-06-13 10:12:22 -07:00
Geoff Mendal
dc2c3d2114 Keep history after reset to ub-mail-master\nBug: 15593367 2014-06-13 07:30:34 -07:00
Tony Mantler
988ad6e002 Move all general prefs values to UnifiedEmail
b/9566150

Change-Id: Id7058586c71c3c1cc4933dc28532a02df90c29bc
2014-06-12 16:23:52 -07:00
Alan Lau
8183be889f am 9773c96d: Return the order key in the conversation cursor.
* commit '9773c96d83f126b8418b192bcf46f939f44fdb44':
  Return the order key in the conversation cursor.
2014-06-12 17:11:50 +00:00
Alan Lau
9773c96d83 Return the order key in the conversation cursor.
For Email the order key is the message timestamp, Gmail sortMessageId.  The
order key is then used as the sort key for notificatin api, and because it is
stable, notification bridger can avoid bridging duplicate notifications and
reodering the email card bundle on the watch.

Bug 15563260

Change-Id: Ie68f45de91cc42c58238b7cdc0ae828048e22a46
2014-06-11 16:16:41 -07:00
Alan Lau
378379929e am 49dd287c: Update manifest for ag/480274
* commit '49dd287cb0ed7c25c3690c56c78111023048a00a':
  Update manifest for ag/480274
2014-06-11 01:02:09 +00:00
Alan Lau
49dd287cb0 Update manifest for ag/480274
Bug 15332337
Bug 15332837
Bug 15532541

Change-Id: I92711d776ffb3b79ea3a6e491eb86b7cecceeaa0
2014-06-10 16:30:27 -07:00
Tony Mantler
14623ba3c2 More dead code
Change-Id: I3178d47c955b060c5d5ab1f0029347b325887fa0
2014-06-10 15:53:23 -07:00
Tony Mantler
51af59fc66 Remove unused preferences and dead code
Change-Id: Ica8bd735a91417ed44bd547ab7176832745d729e
2014-06-10 11:29:17 -07:00
Tony Mantler
8b38cc1739 Merge "Make incoming settings username editable" into ub-mail-master 2014-06-10 18:09:33 +00:00
Baligh Uddin
ecfffe6b49 Merge "Import translations. DO NOT MERGE" into ub-mail-master 2014-06-10 17:13:36 +00:00
The Android Automerger
f5268e0a6e merge in ub-mail-master-release history after reset to 97fb20697c 2014-06-09 20:00:14 -07:00
James Lemieux
97fb20697c Merge "Unit Tests for serialization of Account and HostAuth objects" into ub-mail-master 2014-06-09 23:33:17 +00:00