Commit Graph

9479 Commits

Author SHA1 Message Date
Martin Hibdon
ae0143e489 Fix temporary setup flow on tablets
b/13105763

Change-Id: I63f6956afbbaceadfc1a77701c6f256705601c09
2014-02-20 14:32:22 -08: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
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
Tony Mantler
d006fc94a8 Merge "Convert MailboxSettings to a fragment and fix threading" into ub-mail-master 2014-02-06 20:00:30 +00:00
James Lemieux
7c413c6d51 Merge "Mail in Sent, Drafts and Outbox should show addressees, not sender." into ub-mail-master 2014-02-06 18:32:31 +00:00
Tony Mantler
0f8d16f56a Fix content observing
b/12834957

Change-Id: I00e2fc48e1d78665e0cdcfc3f4fb483f5a047252
2014-02-05 16:58:54 -08:00
James Lemieux
6f4a9eb876 Mail in Sent, Drafts and Outbox should show addressees, not sender.
b/10847599

This is the second attempt at fixing this bug. The strategy has
changed entirely to accommodate GMail as well as reuse formatting
rules that squish the list of conversation participants into an
abbreviated line for display in conversation lists.

ConversationInfo used to include a List<MessageInfo> which was
used to answer questions about which senders had read which
messages in the thread. This has been removed and replaced with a
List<ParticipantInfo>. The backend should populate that list with
appropriate conversation participants (e.g. recipients of the last
message in the case of Sent, Drafts or Outbox; senders for all
other mailbox types)

Change-Id: I32dcc2a255cccaf06c5976633380b2443729f357
2014-02-05 16:00:58 -08:00
Geoff Mendal
aeaf2347f1 Merge "Import translations. DO NOT MERGE" into ub-mail-master 2014-02-05 23:54:54 +00:00
Geoff Mendal
1cd602d008 Import translations. DO NOT MERGE
Change-Id: I6589b510ad8a782ddf90fffd7a578849b994852b
Auto-generated-cl: translation import
2014-02-05 14:47:04 -08:00
Martin Hibdon
636239f417 Merge "Add sign in Activity" into ub-mail-master 2014-02-05 21:26:03 +00:00
Martin Hibdon
58fbd2a477 Add sign in Activity
This allows the user to choose which type of authentication
to use for existing IMAP accounts.

Change-Id: Ib44364a1059a2c4b8a7a0fa66b14cd042b28770e
2014-02-05 13:10:11 -08:00
Tony Mantler
94456929ff Merge "Enable d@d.d debugging" into ub-mail-master 2014-02-04 20:53:12 +00:00
Tony Mantler
d88f132147 Don't try to toggle next button state when the fragment isn't attached
b/12886252

Change-Id: Ie19d8e946139d317f7e867449141dcfd82c510f8
2014-02-04 10:03:08 -08:00
Tony Mantler
70f25e15c9 Enable d@d.d debugging
Change-Id: I16fee21f3b7af0ae653580b5c0fd8b1da6a5d3ae
2014-02-04 09:51:52 -08:00
Geoff Mendal
d7f3cebe50 Import translations. DO NOT MERGE
Change-Id: I609e2347a2ea9ce574cc3d0d4f318d3bb2cdf5ca
Auto-generated-cl: translation import
2014-02-03 17:17:16 -08:00
Tony Mantler
10e9bd96de Convert MailboxSettings to a fragment and fix threading
b/12838753

Change-Id: I58ae069e2e2860c0f7919f44ce125b0c3aad1969
2014-01-31 13:15:42 -08:00
Martin Hibdon
cbab7b409d Fix the build
I left an abstract function unimplemented, but didn't realize
because the function was added to the interface in a very recent cl.

Change-Id: I2b091ed284c256e1624633be6a598ff2798075c0
2014-01-30 16:11:04 -08:00
Martin Hibdon
78280d51db Merge "Use the AuthenticationView for outgoing" into ub-mail-master 2014-01-30 23:29:14 +00:00
Martin Hibdon
9755267336 Use the AuthenticationView for outgoing
Change-Id: I42a6a8e0dfb271f22bbf1d2d18138d27809744bc
2014-01-30 15:20:15 -08:00
Tony Mantler
7ee567f1b4 Merge "Clean up AccountSettingsFragment loading" into ub-mail-master 2014-01-30 23:04:10 +00:00