Commit Graph

2077 Commits

Author SHA1 Message Date
Jessica Wagantall 81609f7861 Android 6.0.1 release 43 (MOB30J)
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlcn+/8ACgkQ6K0/gZqxDngeagCePtxlUAf+tst/1shNLpqiZaiv
 LYwAnA3zmeOA1zGXv54UbxcjldWWqeN6
 =lIlM
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r43' into HEAD

Ticket: CYNGNOS-2373
Android 6.0.1 release 43 (MOB30J)

Change-Id: I1241266b370fb1ba0560217684002d01867a0c77
2016-05-03 12:00:00 -07:00
Sam Lee 2791f0b33b Don't allow cachedFile Attachments if the content Uri is pointing to EmailProvider.
This is to backport a security fix reported by b/27308057 and b/27335139.
Also, add Analytics for these errors.

Bug: b/27335139
Change-Id: Iaacb34e4983cdf9a85487222ae930cb64d80a193
2016-03-25 17:48:04 -07:00
Jorge Ruesga e3c39f0e6d email: Add an ActionBar to the mail app's PreferenceActivity
Change-Id: Id2ed98d2c2cd6648e179fb2942f3bc4479049cd0
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
2015-10-18 14:06:01 -07:00
Jorge Ruesga aea3dff32d email: fix Exchange sync frequency account setup
Auto sync is not displayed as an option in sync frequency settings, because capabilities
aren't filled. Just ensure account capabilities are always saved.

Change-Id: I70b7ab9464a99eebf7f82726faa0fb2418e09a99
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
2015-10-18 14:05:32 -07:00
Jorge Ruesga 08ace26ed6 email: imap push
Change-Id: I8a184a5644e4322ee65d969e14cd47fe119f5df2
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
2015-10-18 14:05:32 -07:00
Jorge Ruesga a2d99c6fea email: custom notification lights
Change-Id: I3aaed3c682ae33da925316a5b9a586796fe71229
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
2015-10-18 14:03:25 -07:00
Jorge Ruesga e0a547bb66 email: fix eas autodiscover
Change-Id: Ifaf5f757f7f844e49f0ac635b477fcbef4926293
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
2015-10-18 14:03:24 -07:00
tobitege 7725334f81 Fix NPE in getHierarchicalFolder
Fixes exceptions like this:
java.lang.NullPointerException: Attempt to read from field 'java.lang.String com.android.mail.providers.Folder.name' on a null object reference
at com.android.email.activity.setup.MailboxSettings$MailboxSettingsFolderLoaderCallbacks.getHierarchicalFolder(MailboxSettings.java:377)

Change-Id: I2c5dda84439caa5d894f5706c9c6a07079cda69c
2015-10-18 14:03:24 -07:00
Jorge Ruesga c60b08e059 email: finish the settings activity after delete its account
Change-Id: I540f1fe9dc874093ad0067cd56c9f0920620ece1
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
2015-10-18 14:03:24 -07:00
Jorge Ruesga 707cdc8b18 email: support per-folder notifications
This change enables support to configure per-folder notifications options.

Change-Id: I6107340da3438ea223506bb22ff898cca179c1f6
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
2015-10-18 14:03:22 -07:00
Jorge Ruesga 8b1818d4a8 email: add an option for delete the account
Change-Id: I0f0f2b7ea950d5154f90cd60261c6918b7ad36b7
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
2015-10-18 14:03:22 -07:00
Tony Mantler b57bca2734 Default to encrypted connections (YAY!)
b/18119357

Change-Id: I2fc79e7c2296f5f48e354c5fe97fd0ea6609bb17
2014-10-24 15:35:46 -07:00
Tony Mantler d716d89459 Don't assume mHostAuthRecv is loaded when checking outgoing
b/18031180

Change-Id: I428021830db373145344a3477e1c5590e8062c10
2014-10-20 17:34:23 +00:00
Tony Mantler f9757504b6 Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev 2014-10-14 17:27:36 +00:00
Tony Mantler 1d929d18fe Initial account setup analytics
Just activity start/stop.

b/17166224

Change-Id: If100a88d6b6fbe05165aaed90b1caaa9c3db12c3
2014-10-13 15:13:28 -07:00
Tony Mantler 0b9d3de5aa Reload settings immediately after toggling sync
Twiddling the AccountManager bits doesn't automatically trigger a
content update, so we refresh manually in those cases.

b/17330140

Change-Id: I294173c9baca231a6f3ff045d0b7795c6b2b2219
2014-10-13 13:37:21 -07:00
Tony Mantler 1927361b25 Merge "Account authentication restyling" into ub-gmail-ur14-dev 2014-10-10 16:36:09 +00:00
Tony Mantler 19ebfab06d Restyle account setup flow nav buttons
b/17266006

Change-Id: Ie60e56b493ba23465a06cce8a3c37d3fd9d061e5
2014-10-09 10:38:47 -07:00
Tony Mantler f5b5fe1cb3 Account authentication restyling
- Add minWidth to fragment
- Remove extraneous LinearLayout and tweak margins to avoid layout jumps
- Change + asset
- Remove old + icon from prefs header from Email

b/8134410

Change-Id: If3371017359b47d9e4280b09fd3bb074b024c23c
2014-10-08 15:49:03 -07:00
Martin Hibdon f987ef8f13 Add ability to clear migration state to debug screen
This makes it a lot easier to test migration code.

Change-Id: I22de8c06c34964b8eb7182571094e54f04d739b8
2014-09-24 11:48:46 -07:00
Paul Westbrook bb68c13afa Changes to support smaller email tombstone apk size
This reduces the tombstone down by 100K

A follow-on cl will remove the unused resources from the tombstone build

Bug: 17414014
Change-Id: I5d38811b17a5273ec726e750ab123e10e36cee04
2014-09-16 13:59:07 -07:00
Martin Hibdon 8209d6c081 Display a warning if account is on security hold
b/17258435

Change-Id: I654db15d59338621829cbb6df106b490ab7bb628
2014-09-12 11:44:26 -07:00
Tony Mantler b38d0bbf8d Use correct password dialog for outgoing settings
We actually want to divert based on incoming protocol, not outgoing

b/17460124

Change-Id: Ic7129d23d36f9f15e2ecbb25d3f11dae12bb56ac
2014-09-11 13:22:02 -07:00
Paul Westbrook f866891f92 Merge "Remove unused resources" into ub-gmail-ur14-dev 2014-09-10 16:49:02 +00:00
Paul Westbrook 8f0f19c414 Remove unused resources
Also remove broken & disabled tests that referenced otherwise
unused resources

Change resource names to prevent duplicate resources.

Bug: 17414014
Change-Id: Iea9f9799ec19692707e2949473c6f97a3bd29f4b
2014-09-10 03:24:53 -07:00
Tony Mantler 8c6a01f876 Remove app icon from Setup and Mailbox Settings
b/16657133

Change-Id: I7ba77a3a355627c1df971aa7238969dfeeaebf28
2014-09-09 16:03:08 -07:00
Tony Mantler dfb7fe91e6 Remove password spaces warning
b/17409681

Change-Id: Ia411999fc7652b520f17fa2538980d9ba4bd172a
2014-09-09 14:41:38 -07:00
Tony Mantler e5ac64a103 Fix spinners layout mangling
Setting the gravity to center_vertical seems to make them behave. Not asking.

Also clean up the layout file in general.

b/17380851

Change-Id: I45ac202825295c577dd1a13a3176ac685bd9b9d8
2014-09-08 15:51:05 -07:00
Martin Hibdon 606213ea02 Fix the text of the authentication label on rotation
b/17410251

Change-Id: I1e902da85a8525e597d205d3be520e6eb6db7f50
2014-09-08 12:54:49 -07:00
James Lemieux 1be8b05bb5 The error message "This field can't be blank" can be ignored
b/17367647

The friendly name paired with the email address is now considered
optional when creating a new email account.

Change-Id: I9398ae48e29ee0554efc9c46e9f2f380e7f17cf9
2014-09-03 15:43:12 -07:00
Martin Hibdon 51c653646d Put debug screen back into settings
There is still work to be done here:
* The debug setting is not persisted in Exchange, so if
the exchange service is killed, when it restarts the logging
will not be active.
* Nothing in Exchange actually does any additional logging
if this logging is turned on.

Change-Id: Ic578e6956f70dd47fba9b2895385312f71c47abf
2014-08-28 11:53:51 -07:00
Tony Mantler c1a760bf36 Match dup accounts against all accounts, not just Email
Also deanonymize loader inner classes
and fix a bug on re-reading a cursor after rotation.

b/16326913
b/15547554

Change-Id: I6e9dd36f425c1df93823a4b9d1faba15a802ad50
2014-08-21 22:12:26 +00:00
Tony Mantler f4b55c8edb Merge "Fix folder sync settings for tablet" into ub-gmail-ur14-dev 2014-08-16 03:56:00 +00:00
Tony Mantler ac4b0efd9f Fix folder sync settings for tablet
b/17068128

Change-Id: Ia61cba10fb0edc97448d9ff39aa58578db1d4ac7
2014-08-15 16:24:38 -07:00
Tony Mantler 486e971066 Fix providers.xml alternate diversion
b/17048013

Change-Id: If2bc857266a6ba1445bf1fabbaed179c1b13a14f
2014-08-15 11:54:56 -07:00
Tony Mantler 9f14d6b0de Extend MailboxSettings to handle full folder list
b/16541463

Change-Id: If428413ad258497a5654fa095d51cd60f6ed4e18
2014-08-13 14:18:01 -07:00
Tony Mantler f1789afa53 Switch null checks to TextUtils.isEmpty()
b/16872654

Change-Id: Ib8943f068ad6988ff08f8bfd54e2df8fa5ce0274
2014-08-07 14:11:02 -07:00
Tony Mantler 751da26172 Add Exchange fallback and support diverting to Gmail
b/16679701

Change-Id: I59d7cb4a803f0ad8e782614d0c6cc635318d2375
(cherry picked from commit d039322f74)
2014-07-31 21:44:26 +00:00
Tony Mantler e96791403e Add support for disabling OAuth on setup flow only
b/16633826

Change-Id: Iea984ae656fbf3fe44de7598fdb9357a18d52a74
2014-07-30 09:55:16 -07:00
Tony Mantler 751a029c31 Convert server settings to dialog
b/8134410

Change-Id: I3c4c9a02a37571a9c7af10971840fbe39458244e
2014-07-29 15:12:04 -07:00
Tony Mantler cd118b3b61 Add support for launching setup flow via intent action
b/16371282

Change-Id: I9ee45d769a6f73fe1e44b7ca7607f8f0b54a703d
2014-07-18 15:35:35 -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
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
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
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
Tony Mantler 8c03e2af9f Remove direct entry points to AccountSettings
b/16240332

Change-Id: I9bc3f9a2e0b7faa4d8875a9ac7d6d585a65d9733
2014-07-11 21:34:55 +00:00
Tony Mantler f90dbc83e2 Strings aren't Integers
b/16189015

Change-Id: Ife4383b5530956fcca7f7970691e9fdec32007ec
2014-07-09 16:02:01 -07:00