Commit Graph

10254 Commits

Author SHA1 Message Date
Martin Hibdon
46f1b89fef Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev 2014-10-03 02:14:01 +00:00
Anthony Lee
ec8c2ac9df Merge "Calculate available background threads for AttachmentService correctly." into ub-gmail-ur14-dev 2014-10-02 22:36:58 +00:00
Anthony Lee
824a80491c Calculate available background threads for AttachmentService correctly.
Also iterated on some logging to help debug Attachment issues:

Bug: 17789960
Change-Id: I77331f9a41f5c95ed228e8ca5fd36a66db5b78ee
2014-10-02 15:29:03 -07:00
Martin Hibdon
601700a61e Get SSLSocketFactory from GmsCore
b/15721931
This follows an example pattern from GoogleHttpClient.
It tries to get the SSLCertificateSocketFactory from
GmsCore using reflection. If that fails, (because GmsCore
is not installed on the device) then it will fall back
to the platform implementation.
MailApplication sets a static object in SSLUtils that
allows it to get an externally created SSLCertifcateSocketFactory.
If this method is set, then it will use it, otherwise it
will fall back to the platform factory. This way there
is no reference to GmsCore in the AOSP email.

Change-Id: I0890fe4c3d79283fb98a4dc5a62a32efd320e52a
2014-10-02 10:54:52 -07:00
Rohan Shah
42a4f20120 Move Email Icons (Email)
Got rid of ic_launcher_mail from Email folder (moved to
UnifiedEmail).

Bug: 16632478
Change-Id: I4ee261fb31afab7bcec7300315b1631910f27231
2014-10-02 10:38:21 -07:00
Rohan Shah
083a013826 Merge "Update Email Icons" into ub-gmail-ur14-dev 2014-10-02 00:46:45 +00:00
Rohan Shah
49dfa15527 Update Email Icons
Added icons with the light, subtle shadows.

Change-Id: Ib3c3893e6b099ea73f1ce5d925c28933b241f544
2014-10-01 17:44:40 -07:00
Rohan Shah
36830d42f8 Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev 2014-10-02 00:29:09 +00:00
Rohan Shah
f22745169c Revert "Clean-up Email Icons"
Need to update Email icons only (Unnecessary work added on for cherry-picking)

This reverts commit 11f5e48526.

Change-Id: Id4a87d7bc73eb91c284661dbffb0d03a73a4e34c
2014-10-02 00:26:55 +00:00
Rohan Shah
6a533823f3 Merge "Clean-up Email Icons" into ub-gmail-ur14-dev 2014-10-01 23:22:52 +00:00
Rohan Shah
11f5e48526 Clean-up Email Icons
Around 2012, icons were submitted into the wrong folders.
Moved these out into UnifiedEmail.

Discovered as a result of shortcut CL - tagging the bug
in case any changes occur in the future.

Bug: 16632478
Change-Id: I2115f9324003a5c4d3e35b9e155405c377522a60
2014-10-01 15:44:17 -07:00
Tony Mantler
b62067e3c3 Make sure old body files don't contaminate new messages
If we have an error writing an old body file and overwrite the same ID,
we might end up in a situation where we have HTML from one message and Text
from another. Clean up the body files before insert to avoid this.

b/17720266

Change-Id: I2fb18fa24c6f3bc01e7c877e2f3bfccee6a34015
2014-10-01 14:02:17 -07:00
James Lemieux
69ba565b62 Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev 2014-09-30 23:11:37 +00:00
James Lemieux
aa2ca51477 Combined view should also display client-side sanitized HTML
b/16206516

Change-Id: I23385f2c29a55a155a4842226d4f1f37943338d2
2014-09-30 14:17:23 -07:00
James Lemieux
40236a8931 Display sync errors using snackbar and not as a TL footer
b/16463253

The FAB compose button overlaps the action button found in the TL footer
when network errors occur during sync. To avoid this overlap, the snackbar
is used to display these errors and they no longer appear as a TL footer.

In order to signal the sync error to AAC for display in the snackbar, the
Folder.lastSyncResult needed to be encoded in the manner that AAC reads.
This was not happening for POP/IMAP/Exchange accounts, so a large portion
of this change is encoding that value properly every place it is written.

To ensure the value is read/written properly everywhere, common methods were
introduced in UIProvider that do this work. UIProviderTest was also added
to ensure the read/write methods agree with each other.

Finally, the display of the "Load More" TL footer was updated to match the
latest spec.

Change-Id: I9d3ae1157f288f05b0fed4d1385858f6c9ebfbf9
2014-09-29 17:51:27 -07:00
Baligh Uddin
abd75d1adb Import translations. DO NOT MERGE
Change-Id: I05757a0df1ee5bbffcbe6dff1b0856b1a4bba19a
Auto-generated-cl: translation import
2014-09-29 14:41:16 -07:00
Régis Décamps
f99328b07c minor: remove comment that primaryColor is used for ActionBar
Remove unhelpful comment that primaryColor is used for ActionBar and
that primaryColordark is used for status bar.

Change-Id: Id27c80ecb79852084ffe4d11540d89eac03e9cb5
2014-09-29 18:50:18 +02:00
Martin Hibdon
3c2f782c35 When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
b/17443087
When we migrate exchange accounts, we copy mailboxes over to the
new account (in order to preserve sync frequency and window).
The problem with this is, you may have many accounts/mailboxes.
After starting the app, it may take quite a long time before all
mailboxes are synced. If the user visits some mailbox near the
bottom, they'll see a misleading "folder is empty" view.
Now, when migrating, we'll set the uisyncstatus to INITIAL_SYNC_NEEDED.

Here I needed to add INITAL_SYNC_NEEDED to the list of states
that EmailConversationCursor will consider incompletely loaded.

Change-Id: Idef13adf9d691c03665830a2f926b1806d7591da
2014-09-26 16:02:22 -07:00
Martin Hibdon
d10ae46e60 Merge "Don't allow disabling of the camera with managed profiles" into ub-gmail-ur14-dev 2014-09-25 20:51:46 +00:00
Martin Hibdon
ce6916b32a Don't allow disabling of the camera with managed profiles
Change-Id: I2e6085084682b04ef7973bc433214b5b3ab2da79
2014-09-25 13:48:11 -07:00
Rohan Shah
a64435a62f Update colors in Email (ColorRefactor)
Change-Id: Ie611ccb3af9043fac73d80fa910f91960c6bbbac
2014-09-25 11:45:42 -07:00
Martin Hibdon
809313bda6 Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev 2014-09-24 18:55:19 +00: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
Martin Hibdon
123d40283e Make sure to close a cursor
b/17570154

Change-Id: I759a116a14784e92e7fa7eb51755ceda3860550e
2014-09-24 11:30:52 -07:00
James Lemieux
f1b6b3afd9 Old paper clip asset is removed, which touches a test case here.
Change-Id: Ie070eaeb7d3c4a3663da4cd4761328241ce6467f
2014-09-22 14:00:00 -07:00
Baligh Uddin
d54cebe5ec Import translations. DO NOT MERGE
Change-Id: I2a3a04830ee77f12c0e03932fe1287eda569fba4
Auto-generated-cl: translation import
2014-09-20 11:36:41 -07:00
Andrew Sapperstein
9f252e1f54 Renaming to support drawer under status bar.
b/17569398

Change-Id: Iab1cea59956fb8a863025312a99f9bd206e2dcac
2014-09-18 15:04:38 -07:00
Baligh Uddin
fc1ba99a37 Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev 2014-09-18 17:58:08 +00:00
Martin Hibdon
0b693a0556 Merge "Fix subfolders of the inbox." into ub-gmail-ur14-dev 2014-09-17 18:18:24 +00:00
Martin Hibdon
99f9ead3ef Fix subfolders of the inbox.
b/17327099

Change-Id: I82f82a9bf2ceda73606471dc669253d2ac4ec0c5
2014-09-17 11:00:07 -07:00
Paul Westbrook
7f32e9c661 Prevent AccountSettingsFragment from being stripped
Bug: 17541363
Change-Id: I970206ee37bd8cf3afa69eb464f0e8b83d52fe4f
2014-09-17 10:20:17 -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
Baligh Uddin
58aaba5759 Import translations. DO NOT MERGE
Change-Id: Ic0b93337f379eb395b8489684596dc26fae41c26
Auto-generated-cl: translation import
2014-09-16 09:25:16 -07:00
Andrew Sapperstein
88929fd2bc Switch to targetSdkVersion=21. b/16408109
Change-Id: I9a9549cab0c065f9e37ea12df35489d7cfa0d0d9
2014-09-15 13:16:44 -07:00
Baligh Uddin
3b47856dc2 Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev 2014-09-15 01:04:17 +00:00
Baligh Uddin
25231ac72b Import translations. DO NOT MERGE
Change-Id: Ice143264dc53f4f738e2f4808b3719155af4aa67
Auto-generated-cl: translation import
2014-09-14 16:49:18 -07:00
Baligh Uddin
ff83aff97d am e421a5e1: (-s ours) Import translations. DO NOT MERGE
* commit 'e421a5e10a0cf640975f5bdb70e9bd399e9c7f95':
  Import translations. DO NOT MERGE
2014-09-14 17:46:42 +00:00
Baligh Uddin
e421a5e10a Import translations. DO NOT MERGE
Change-Id: I7f780e86b61d610e97142ad318be0aae51d77720
Auto-generated-cl: translation import
2014-09-14 10:09:15 -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
ce6e2de718 Merge "Use correct password dialog for outgoing settings" into ub-gmail-ur14-dev 2014-09-11 20:35:14 +00: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
Tony Mantler
cb45d6fabe Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev 2014-09-11 19:29:45 +00:00
Tony Mantler
a9f69fc4ce Change account type strings for AccountManager UI
b/17365679

Change-Id: I9feafcb5a1b184706b98f288d292cb924107f38e
2014-09-11 11:47:02 -07:00
Baligh Uddin
efca9af619 Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev 2014-09-11 15:25:52 +00: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
Tony Mantler
c6d5ec490e No more big yellow envelope
b/17266006

Change-Id: I80d91992430c7da30e81a8e0783e6308ba286303
2014-09-10 13:51:11 -07:00
Paul Westbrook
f866891f92 Merge "Remove unused resources" into ub-gmail-ur14-dev 2014-09-10 16:49:02 +00:00