Commit Graph

10133 Commits

Author SHA1 Message Date
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
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 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
Paul Westbrook 57dbc3bf02 Remove proguard config for removed class
Change-Id: Ic926aa18d6d8a889c20c7f850a200774188ad422
2014-06-17 01:37:43 -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
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
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
Tony Mantler 5da2f12dc5 Make incoming settings username editable
And get rid of that annoying "you can't edit this" info text bubble

Change-Id: I7efc039b39be292512f25bd5470b7ae36927c8f3
2014-06-09 16:23:57 -07:00
James Lemieux 9250f47872 Unit Tests for serialization of Account and HostAuth objects
b/14998528

These are particularly important since they are stored in JSON form within the
Account Manager, so maintaining backward compatibility when future changes are
introduced is crucial.

Change-Id: I51333a364726a4c7e2fe88ee888e8c4cc11d962f
2014-06-09 16:18:27 -07:00
Martin Hibdon b1b9707b77 am a516bd82: Update email version number
* commit 'a516bd820dcba6ce6b20e89c2167742da8dc6267':
  Update email version number
2014-06-09 22:55:48 +00:00
Martin Hibdon a516bd820d Update email version number
Change-Id: Id9b77db64b9ee414c326d576ad5c92c4e789da44
2014-06-09 15:50:52 -07:00
Tony Mantler 524e0a5fbc am 73101f3a: Fix OAuth when changing credentials from settings
* commit '73101f3a7bc1e735199a7c2c18358e9db9af0bca':
  Fix OAuth when changing credentials from settings
2014-06-09 22:50:37 +00:00
Tony Mantler 73101f3a7b Fix OAuth when changing credentials from settings
b/15521401

Change-Id: I7909389943c8e3eefbef0699f1c7c9c338282ca5
(cherry picked from commit 994c282d80)
2014-06-09 22:45:45 +00:00
Tony Mantler 994c282d80 Fix OAuth when changing credentials from settings
b/15521401

Change-Id: I7909389943c8e3eefbef0699f1c7c9c338282ca5
2014-06-09 15:28:11 -07:00
Baligh Uddin fd6c63d18f Import translations. DO NOT MERGE
Change-Id: Ide656b0a564018891e08956d553e82f14d617e29
Auto-generated-cl: translation import
2014-06-09 13:33:23 -07:00
Baligh Uddin 0f1d3a8f11 Merge "Import translations. DO NOT MERGE" into ub-mail-master 2014-06-07 04:18:53 +00:00
Anthony Lee 11708a64a5 Merge "Some more cleanup and code rearrangement & added unit tests for ServiceCallback." into ub-mail-master 2014-06-05 23:41:56 +00:00
Anthony Lee 39e3bd63b5 Some more cleanup and code rearrangement & added unit tests
for ServiceCallback.

Change-Id: I6017e50455df3dda9ef6ec54ffd4fbc4e9b1a2d9
2014-06-05 14:57:44 -07:00
Tony Mantler 458c753c27 Merge "Clean up cert activity handling" into ub-mail-master 2014-06-05 21:19:15 +00:00
Martin Hibdon 6af16d627d am 5369b102: Update version number
* commit '5369b102c7685d7e8c2ed6352ae48bc84f9283d7':
  Update version number
2014-06-05 20:32:27 +00:00
Tony Mantler f765f9b976 Clean up cert activity handling
Fix re-displaying the dialog on orientation change b/5622284
Add host/port when available b/4988512
Disambiguate intent between AOSP and EmailGoogle

Change-Id: Ideeda20dfd9bd0070998ccf42d8042765866ca0e
2014-06-05 13:21:08 -07:00
Martin Hibdon 5369b102c7 Update version number
Change-Id: Ic18cd52ffdfe2905a7d9510f41f1331c2ef11675
2014-06-05 13:16:45 -07:00
Greg Bullock 9909fabcc6 Switch to using automatic resource namespaces for drawables and services.
Change-Id: If90089be6be004c87bdda5a5c3ed036a48205229
2014-06-05 17:25:51 +02:00
Martin Hibdon 43ab1020f1 Merge "Delete obsolete code" into ub-mail-master 2014-06-04 21:00:29 +00:00
Baligh Uddin 507d5fe12b Import translations. DO NOT MERGE
Change-Id: I41875186f162d7a1d458cf662aeb5aade4197845
Auto-generated-cl: translation import
2014-06-04 13:18:16 -07:00
Martin Hibdon fcb9d58129 Delete obsolete code
PartRequest was only used by obsolete Exchange code.

Change-Id: I708648c24c8b1af37928131186b8a84ff23dd3ef
2014-06-04 11:41:13 -07:00
Baligh Uddin 5c0e0c47b2 Merge "Import translations. DO NOT MERGE" into ub-mail-master 2014-06-04 04:53:13 +00:00
Baligh Uddin 7dfa1c6dcf Import translations. DO NOT MERGE
Change-Id: I439dbd842735d5ef2e118b863ccd32114312fbc2
Auto-generated-cl: translation import
2014-06-02 14:33:17 -07:00
Alan Lau 3f553c4729 am 07e0bf5c: (-s ours) DO NOT MERGE Adding data to the pending intent for notification action. This is now needed because Wear allows users to perform action on each conversation and therefore the pending intent can\'t be shared.
* commit '07e0bf5c74aaba7651deec64b5b7b8956a5e9d9d':
  DO NOT MERGE Adding data to the pending intent for notification action.  This is now needed because Wear allows users to perform action on each conversation and therefore the pending intent can't be shared.
2014-06-02 17:47:50 +00:00
Alan Lau 07e0bf5c74 DO NOT MERGE Adding data to the pending intent for notification action. This is now needed
because Wear allows users to perform action on each conversation and therefore
the pending intent can't be shared.

Bug 15344221

Change-Id: Ib6d3f17ba64c1a8a14ab9abe56b2d8168c7b9558
(cherry picked from commit 10d73dbe18)
2014-06-02 17:17:23 +00:00
Alan Lau 3355e58f56 am 10d73dbe: Adding data to the pending intent for notification action. This is now needed because Wear allows users to perform action on each conversation and therefore the pending intent can\'t be shared.
* commit '10d73dbe18873bbea41608072544e251cb89d85c':
  Adding data to the pending intent for notification action.  This is now needed because Wear allows users to perform action on each conversation and therefore the pending intent can't be shared.
2014-05-31 02:18:57 +00:00