Commit Graph

4787 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
Danny Baumann
a29e6b2215 Improve notification coalescence algorithm.
Instead of coalescing for 15 seconds after the first change
notification, coalesce until change notifications have been idle for at
least 2 seconds. This avoids long update delays, which is especially
jarring when using notifications on a wearable and the initial
notification didn't yet include the message body.
Also skip coalescence entirely for deletions; update immediately in that
case.

Change-Id: I67bed9a1af7b023020b0fd5429495eb45000e858
2016-01-20 23:32:40 -08: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
Rohan Shah
72f6a2432e Revert "Update notification icon asset names (Email)"
Need to revert - doesn't build on Mac OS

This reverts commit cc82965ac9.

Change-Id: I98c03ebe85df29ff146d0cee6ae112ab36e6d8b0
2014-10-13 18:58:56 +00:00
Rohan Shah
cc82965ac9 Update notification icon asset names (Email)
Bug: 17936539
Change-Id: Ia2b3d4a18a30f9cfbfcda2c68a3ef579c0c75086
2014-10-10 15:11:55 -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
Rohan Shah
58d7f7b223 Merge "Tag Notifications with People (Email)" into ub-gmail-ur14-dev 2014-09-12 00:24:01 +00:00
Tony Mantler
b3be4655a8 Merge "Sync account immediately upon restore" into ub-gmail-ur14-dev 2014-09-11 20:45:36 +00:00
Tony Mantler
a3652cbf8b Sync account immediately upon restore
b/17443087

Change-Id: Ib38fa3551090db85c1f7391fcaa8ce6a8ed7c375
2014-09-11 13:43:41 -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
Rohan Shah
7afc426464 Tag Notifications with People (Email)
Just adding the argument for ContactLookupUriFetcher
as null (Since we don't use Menagerie for non-Gmail).

Bug: 15385612
Change-Id: Idbd76a181ba18fba81a9ff933e4f1a96c11d1b60
2014-09-10 15:23:18 -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
c845295ffb Merge "Fix the text of the authentication label on rotation" into ub-gmail-ur14-dev 2014-09-08 20:05:21 +00: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
3bdce9b515 Remove server-side sanitized HTML capability;
add client-side santized HTML capability

b/16896849

The semantics of the SANITIZED_HTML capability have narrowed. It now means
"Html email bodies for this account are assumed to be sanitized by the mail
server"

Consequently, accounts in Email no longer set this capability, but do set
the new capability permitting client-side sanitization of email bodies

Change-Id: Ie1343d8bedc2a17ab04e4df4b7c4ee14cfb01b64
2014-09-08 10:50:15 -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
Tony Mantler
e068440f65 Merge "Update search folder status in a finally block" into ub-gmail-ur14-dev 2014-08-28 22:00:47 +00:00
Martin Hibdon
e87b38faf5 Merge "Prevent account reconcilliation during migration" into ub-gmail-ur14-dev 2014-08-28 20:57:29 +00:00
Martin Hibdon
5f1749bb0e Prevent account reconcilliation during migration
b/17221527

Change-Id: I7077a90af8317aa38e865e345aff7fb33083ddc2
2014-08-28 13:55:00 -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
35b9801eb8 Update search folder status in a finally block
Also clean up a dangerous logging call and clean up some warnings

b/17283951

Change-Id: Ia295218e5ee1162dac68c5a8e7eff6a9dd74a918
2014-08-27 13:46:46 -07:00
Anthony Lee
0397e7fb23 b/17209397. NOOP getServiceMap() if we are in the tombstone app.
If this is the Email Tombstone app, we throw an ISE when
we launch the app after resetting data because certain
services do not exist in this version of the app.

Change-Id: I01d88ac2b745d45c1835354b36837f8aaaf378d8
2014-08-25 14:12:16 -07:00
Jin Cao
65c217943a Remove getSuggestionsAuthority
Change-Id: I0675c1e59047723cef2ad072b9a1e003ca03aa11
2014-08-22 15:13:39 -07:00
Jin Cao
9ac6ec7285 Merge "Remove default search for Email" into ub-gmail-ur14-dev 2014-08-22 22:07:43 +00:00
Jin Cao
c926864e4b Remove default search for Email
b/17209360

Change-Id: I798139e5ab6f8cd29dde1dd475de17138330d8c5
2014-08-22 14:44:26 -07:00
Tony Mantler
207a35f174 Fix search mailbox status on early-out when searching
b/17109656

Change-Id: I8ff643d57a461d81519da65d017c8c3cc95c5659
2014-08-22 14:29:33 -07:00
Tony Mantler
473ce1fa35 Fix some AOSP NPEs
In AOSP the account types of IMAP and POP overlap so we can't
reverse the protocol from the account type. This is OK since all
we care about is if it's Exchange or not.

b/17183137

Change-Id: I112e56c9a0c0009a74f391749d535ada9f0f99ba
(cherry picked from commit 18663ef54ed2d7217d0176b4c5928380deaf9f64)
2014-08-22 17:58:22 +00:00