Tony Mantler
da2582c9f4
Merge "Quit dropping inline attachments on the floor" into ub-mail-master
2014-02-21 20:59:12 +00:00
Tony Mantler
c5685ba600
Fix tests
...
Change-Id: I89370919dd5a8a129ea946f2d3429f0d4a056eb6
2014-02-21 11:43:19 -08:00
Tony Mantler
16fea4dfc0
Quit dropping inline attachments on the floor
...
If we have image/* attachments with "Content-Disposition: inline" we would
fetch the images immediately, then drop them on the floor instead of saving
them to the DB.
Add code to catch these attachments and save them.
b/13132802
Change-Id: I5203bb1aa518aa46cdb3a38ead6f79af63b521ac
2014-02-21 11:16:29 -08:00
Brett Chabot
5f72d21df9
Add a placeholder flaky test.
...
For fun and profit.
Change-Id: Id9feb6bc89a66143f1220053fdf0e3fd25097229
2014-02-20 21:59:50 -08:00
Brett Chabot
695c77e526
Convert Email tests to use android-support-tests
...
Change-Id: I173afa352504757e84f5cc48dca8b493957ff6a1
2014-02-20 21:03:07 -08:00
Martin Hibdon
c02e3d5567
Merge "Fix temporary setup flow on tablets" into ub-mail-master
2014-02-20 22:45:50 +00:00
Martin Hibdon
ae0143e489
Fix temporary setup flow on tablets
...
b/13105763
Change-Id: I63f6956afbbaceadfc1a77701c6f256705601c09
2014-02-20 14:32:22 -08:00
Baligh Uddin
7e1dc278c7
am ecbdb2e3
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ecbdb2e39070ddd20f759f1ca41c0222e01db10e':
Import translations. DO NOT MERGE
2014-02-20 21:18:31 +00:00
Baligh Uddin
09ac61a1ca
am eebefdbc
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'eebefdbc2fd08441cf4235ee0a940fc76375e2f0':
Import translations. DO NOT MERGE
2014-02-20 13:18:12 -08:00
Baligh Uddin
ab74aa6ce2
Merge "Import translations. DO NOT MERGE" into ub-mail-master
2014-02-20 21:16:39 +00:00
Baligh Uddin
cad590c9a4
Import translations. DO NOT MERGE
...
Change-Id: I10e59f47be32dbf3ff8d301c03751f6ef5d355e8
Auto-generated-cl: translation import
2014-02-20 11:23:04 -08:00
Baligh Uddin
ecbdb2e390
Import translations. DO NOT MERGE
...
Change-Id: I8524ae21a5965ca5188e8190e40b6c1ec553583c
Auto-generated-cl: translation import
2014-02-20 11:18:49 -08:00
Baligh Uddin
eebefdbc2f
Import translations. DO NOT MERGE
...
Change-Id: I6783f200c9b6f1e152f96ac998e720707b39891d
Auto-generated-cl: translation import
2014-02-20 11:07:40 -08:00
Jerry Xie
3555dc03bf
Add @SmallTest annotation to test classes so they get run in continuous
...
Change-Id: Ieb0e3af146a6668c813ff16a718221eae61e8e01
2014-02-19 20:13:59 -08:00
Martin Hibdon
aab398522a
Merge "Fix some broken tests" into ub-mail-master
2014-02-20 00:27:42 +00:00
Martin Hibdon
10c7412555
Fix some broken tests
...
b/13085182
You can't look up emailServiceInfo for smtp, we don't store that
in services.xml. The thing is, if we're using outgoing settings,
we're always using smtp, which allows oauth.
Change-Id: I5c6032e8d5020ba83fa1c803666b83f134f87f75
2014-02-19 16:17:43 -08:00
Tony Mantler
6c241b9738
Merge "Fix unbounded async task creation in ADS" into ub-mail-master
2014-02-19 19:35:01 +00:00
Martin Hibdon
56b7ef3c0d
Merge "Update version number" into ub-mail-master
2014-02-19 18:03:01 +00:00
Martin Hibdon
6864d7e1a9
Update version number
...
Change-Id: I17500d6f570bb0ebb0fe6cb7d955883cc1e2ceb8
2014-02-19 09:58:27 -08:00
Tony Mantler
426de73380
Fix unbounded async task creation in ADS
...
Queue operations through a single ConcurrentLinkedQueue and
service the updates on a single async task to avoid spamming the
async thread task queue.
b/11336926
Change-Id: I8e5c526d61f70fbad0ccef80afd08fc26bb5acf0
2014-02-19 09:48:58 -08:00
Tony Mantler
822f17d6c1
Merge "Mark otherwise unused method as @VisibleForTesting" into ub-mail-master
2014-02-19 00:11:01 +00:00
Tony Mantler
feeb1e3ada
Mark otherwise unused method as @VisibleForTesting
...
Also fix spelling cancellAllInterrupt -> cancelAllInterrupt
b/13082964
Change-Id: I2fef949bb351a536fdd0d7058b3df2b03eecb39e
2014-02-18 15:59:03 -08:00
Martin Hibdon
d9cec23689
Fix the build
...
I merged some previous changes wrong.
Change-Id: I8af86e398dc4875aae4251e821ac42b8b8fea354
2014-02-18 15:01:16 -08:00
Martin Hibdon
7190973877
Fix authentication view
...
Unfortunately, there are problems with making a single
view handle all kinds of authentication and certificate
selection. The layouts for the account settings screen
on phones versus tablets are just too different. So
now the certificate selection code has moved back to the
fragments themselves, and the authenticationView only
handles passwords and oauth.
Change-Id: I1ef0c69687a00029717b836458c85c1b0667ff95
2014-02-18 14:40:36 -08:00
Martin Hibdon
30cb139f30
Merge "Update assets for setup" into ub-mail-master
2014-02-18 21:34:39 +00:00
Martin Hibdon
9cf99fcf1f
Update assets for setup
...
Change-Id: I03a2224d95f72bdecab5d98e7a2075b40eac5795
2014-02-18 13:12:23 -08:00
Martin Hibdon
e0750df7b3
Merge "Fix account setup test" into ub-mail-master
2014-02-18 20:52:44 +00:00
Martin Hibdon
ad94ecc471
Fix account setup test
...
Change-Id: I7c1b785e5aa29cc7f47920d857441f1a09f05b21
2014-02-18 12:25:41 -08:00
Baligh Uddin
872ac905b1
Import translations. DO NOT MERGE
...
Change-Id: Ia37ab9c4383edec2fe3d54d070fc496d1c1476e4
Auto-generated-cl: translation import
2014-02-17 16:36:07 -08:00
Martin Hibdon
0962a44fc4
Merge "Update layouts for setup" into ub-mail-master
2014-02-14 23:42:22 +00:00
Martin Hibdon
da9c2d66f6
Merge "Remove some security violating logging" into ub-mail-master
2014-02-14 23:40:13 +00:00
Martin Hibdon
b94bfc31cd
Remove some security violating logging
...
Change-Id: Icf53b132516be5f1b392fb9bd3a8970634212642
2014-02-14 15:36:38 -08:00
Martin Hibdon
8919f5738d
Update layouts for setup
...
Change-Id: I5508f6f8640ffdf60f8d1d7282cc7ed3ce30f86c
2014-02-14 15:29:56 -08:00
Martin Hibdon
b9f8dbce19
Change account settings buttons back to text
...
We actually only want the nav arrows on initial
account setup, not in regular settings.
Change-Id: I02e153638e5df29c1fd7aa134db36bde9fc0666e
2014-02-14 13:30:02 -08:00
Martin Hibdon
38fd08e470
Merge "Make settings flow work for OAuth" into ub-mail-master
2014-02-14 19:59:25 +00:00
Martin Hibdon
87de90282b
Make settings flow work for OAuth
...
Now the password entry is removed from AccountSettingsBasics,
and the user is taken to either SignInActivity or AccountSetupType
after hitting the next button. This is a lot closer to the
desired setup flow as it allows for oauth signin.
Ideally this is not what we will ship for Algol, but it put us
in a state where we could ship if we had to.
Change-Id: I5b28bccd27c515572e4947ca877bd1772732507d
2014-02-14 11:55:26 -08:00
Anthony Lee
c165d9bd77
Merge "Introduce an SSL handshake timeout value of 30 seconds." into ub-mail-master
2014-02-13 19:15:42 +00:00
Anthony Lee
37a4c65e58
Introduce an SSL handshake timeout value of 30 seconds.
...
Motorola 0009-IKXREL1KK-5011 patch. Hanging on an SSL handshake is
a real situation that needs to be handled. 30 seconds is more than
enough of a timeout to abort on a potential hang. The coincidental
thing is that there was a fix that was made a while back to email 1
that addressed the same issue in similar code. You can reference it
here: b/7583420.
Change-Id: I0533e57f8c5d45d241adb7f37d54ebe1f0ad9368
2014-02-13 08:32:10 -08:00
Baligh Uddin
1fa4cf0041
Merge "Import translations. DO NOT MERGE" into ub-mail-master
2014-02-13 06:34:33 +00:00
Anthony Lee
6ef1621f44
In 4.4 unbindService can return other RuntimeExceptions outside of
...
IllegalArgumentException. Make sure we catch it.
This fix comes from Motorola 0007-IKXREL1KK-3886 but part of that
patch was reverted because we already had found and fixed the
other problem.
Change-Id: I0b6aa1f91e7d2fa4dfc3af5ff590781c8812c14e
2014-02-12 14:08:40 -08:00
Baligh Uddin
6924a80b09
Import translations. DO NOT MERGE
...
Change-Id: I8723c71c69e9b240a3f9e5aeb2d9bce25912f991
Auto-generated-cl: translation import
2014-02-12 13:40:48 -08:00
Baligh Uddin
1e05bc7d73
Merge "Import translations. DO NOT MERGE" into ub-mail-master
2014-02-11 21:27:25 +00:00
Baligh Uddin
35191b4317
Import translations. DO NOT MERGE
...
Change-Id: Ia5024a299db2bacbe50db76c030a3734bb34dc4c
Auto-generated-cl: translation import
2014-02-10 15:59:38 -08:00
Martin Hibdon
7b42720199
Fix some more setup layouts
...
This moves the nav buttons to the bottom of the screen, and
improves tablet layouts.
Change-Id: I20642c81b96307e4f45b1b3ad1337d4ff5aafd2e
2014-02-10 15:45:33 -08:00
Martin Hibdon
0c1617f6aa
Fix the layout for the sign-in activity
...
Now, the forward and back buttons on part of the activity,
like the rest of setup.
Change-Id: I4c94b8e0ad79c972e2f79be67b80d51f2d19ca30
2014-02-10 15:14:56 -08:00
Anthony Lee
b4bf6ba6a3
comment out broken unit tests in Email
...
Change-Id: I74584344e31c38df4a57ae3d65a01a5bdd2c5a46
2014-02-07 14:19:21 -08:00
Tony Mantler
cd45d20256
Merge "Fix content observing" into ub-mail-master
2014-02-07 18:44:23 +00:00
Martin Hibdon
3aa8013065
Update some setup layouts to use the new buttons
...
The layouts are still not all up to spec, but we're using
the right buttons now.
Change-Id: Iba22bb12d45f7510345f801f21cfc79728b314e4
2014-02-06 16:11:50 -08:00
Martin Hibdon
0d1b845179
Merge "Add new navigation buttons for setup" into ub-mail-master
2014-02-06 22:52:41 +00:00
Martin Hibdon
0300541139
Add new navigation buttons for setup
...
These are not used yet, a following checkin
will put them in the setup screens.
Change-Id: Ib8c63dfb81ce9478dc9fb8ebc52e5a3af11b1686
2014-02-06 14:49:20 -08:00