Commit Graph

4765 Commits

Author SHA1 Message Date
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
Anthony Lee
355e9dffc3 Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev 2014-08-22 17:15:44 +00:00
Anthony Lee
ce1faa889d b/17193866. Update policies when we reconcile.
In the situation where we have deleted an Account from our
provider reconciliation will delete the associated amAccount.
Unfortunately, there isn't any sort of side effect code path
that considers that policies may need to be updated when
this Account is deleted. This CL injects that logic.

Change-Id: I27c7a35efbdca4be274a9d3d8f7ce698f9204092
2014-08-22 10:03:44 -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
1e6f26af80 Merge "Drawer resource updates" into ub-gmail-ur14-dev 2014-08-16 04:03:42 +00:00
Tony Mantler
ebae672af4 Drawer resource updates
b/17071718

Change-Id: I4a3a93b23c68f63d306fedf39ebbae09ee5ee094
2014-08-19 14:20:12 -07:00
Rohan Shah
523d3073f6 Update Notifications (Email)
Got rid of large icon and only setting 'small icon' now.
If conceal sensitive info has been enabled, also hides
the ending of the account address.

Bug: 16987147
Change-Id: I0899a602d1dfdaef980002746ce9079912f0525c
2014-08-19 17:54:45 +00:00
Paul Westbrook
1371dd990f Change method signature
Bug: 16153528
Change-Id: I7f183bab825176814275f6c99981554e4529983a
2014-08-19 03:28:43 -07: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
Rohan Shah
a8a185f75c Merge "Update Notifications Icon (Email)" into ub-gmail-ur14-dev 2014-08-15 18:45:09 +00:00
Rohan Shah
b5e710f447 Update Notifications Icon (Email)
Rest in pieces little gmail icon :(

Change-Id: I14459cba33cf61f6717d922bdb006d8d56ad893c
2014-08-15 17:54:08 -07:00
Tony Mantler
486e971066 Fix providers.xml alternate diversion
b/17048013

Change-Id: If2bc857266a6ba1445bf1fabbaed179c1b13a14f
2014-08-15 11:54:56 -07:00
Rohan Shah
7941b406cf Update Notifications (Email)
Switched out icons (For updated mail notify icon).

Bug: 16987147
Change-Id: I695b4c51daddc47eecbe7d856de642932190c4bb
2014-08-13 17:24:52 -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
James Lemieux
66ff95a561 Merge "End of Life screen for Email" into ub-gmail-ur14-dev 2014-08-12 23:14:33 +00:00
James Lemieux
50591a7be4 End of Life screen for Email
b/16843301

This introduces a new build target: EmailGoogleTombstone.
Building with a tapas line that includes that target will
produce EmailGoogleTombstone.apk. The apk includes the
EmailProvider and AttachmentProvider (for migration to
Gmail) and an activity that explains to the user where to
find their email data.

Change-Id: Ib8192b46d9017e04f5c99f5c8e509531198eec07
2014-08-14 11:31:33 -07:00
Tony Mantler
4c86584685 Don't return a protocol for a null account type
b/16735532

Change-Id: Ie83709fe3a9942ef946cf86f853b3d6565dc5799
2014-08-07 15:36:20 -07:00
Tony Mantler
f1789afa53 Switch null checks to TextUtils.isEmpty()
b/16872654

Change-Id: Ib8943f068ad6988ff08f8bfd54e2df8fa5ce0274
2014-08-07 14:11:02 -07:00
Anthony Lee
8218d00634 Merge "Make sure that we close the cursor." into ub-gmail-ur14-dev 2014-08-07 15:00:45 +00:00
Anthony Lee
4524dccde8 Make sure that we close the cursor.
Found this problem while testing Email migration.

Change-Id: I07862b5c4dd2ef189a87f7dbd085030c448f365f
2014-08-07 13:13:21 -07:00
Tony Mantler
1381d4083b Skip null/empty account types
b/16730607

Change-Id: I6b3207edbf3dc841dd2222e92f69d270a0caf773
2014-08-07 12:58:18 -07:00
Régis Décamps
f9d845c1b7 Fix getAllAmAccounts() returning duplicated accounts
Use a set to save the account types, in order to de-duplicate identical
types.

Also, remove unused imports.

Bug: 16811863 Duplicate POP accounts are listed
Change-Id: If699d03b2c12959cfde9926bec9352b71c3d8912
2014-08-06 20:27:39 +02:00