Commit Graph

1405 Commits

Author SHA1 Message Date
Baligh Uddin
e41461c151 Import translations. DO NOT MERGE
Change-Id: I814417b33835cb75d196077b56c073514235a9c4
Auto-generated-cl: translation import
2014-02-26 13:11:12 -08:00
Baligh Uddin
7f6855864c Merge "Import translations. DO NOT MERGE" into ub-mail-master 2014-02-25 17:23:25 +00:00
Baligh Uddin
9beac5ce87 Import translations. DO NOT MERGE
Change-Id: Ida34fae1488c3d5a05b1e69e622f83252d810c42
Auto-generated-cl: translation import
2014-02-24 14:20:43 -08:00
Martin Hibdon
d9abcfa2be Merge "Update the title for the oauth authentication screen" into ub-mail-master 2014-02-24 19:17:14 +00:00
Martin Hibdon
ff3276a69d Update the title for the oauth authentication screen
Change-Id: I93300791551e199c47880773f2ea9301154cd077
2014-02-20 16:08:46 -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
cad590c9a4 Import translations. DO NOT MERGE
Change-Id: I10e59f47be32dbf3ff8d301c03751f6ef5d355e8
Auto-generated-cl: translation import
2014-02-20 11:23:04 -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
9cf99fcf1f Update assets for setup
Change-Id: I03a2224d95f72bdecab5d98e7a2075b40eac5795
2014-02-18 13:12:23 -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
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
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
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
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
Geoff Mendal
d7f3cebe50 Import translations. DO NOT MERGE
Change-Id: I609e2347a2ea9ce574cc3d0d4f318d3bb2cdf5ca
Auto-generated-cl: translation import
2014-02-03 17:17:16 -08:00
Martin Hibdon
9755267336 Use the AuthenticationView for outgoing
Change-Id: I42a6a8e0dfb271f22bbf1d2d18138d27809744bc
2014-01-30 15:20:15 -08:00
Martin Hibdon
26ff609ebf Fix a crash trying to use AuthenticationFragment
Putting authentication in a fragment was a problem, it
means that we need fragments as children of other fragments.
While this works in theory, it adds a lot of complexity.
Now, authentication is done with AuthenticationView,
which is just an extension of LinearLayout.
Currently, this does not yet handle adding certificates
for exchange accounts, but I'll fix that ASAP. As it is,
this is better than the current state, which crashes on
account setup 100% of the time.

Change-Id: I4274e7250f97012c3dc476003fd36fb960f2b728
2014-01-29 21:45:31 -08:00
Martin Hibdon
155bc17928 Merge "Create AuthenticationFragment" into ub-mail-master 2014-01-29 19:23:26 +00:00
Martin Hibdon
9195a12024 Create AuthenticationFragment
This is one fragment that holds all types of
authentication information, e.g. password,
OAuth info, and client certificates. What gets
displayed depends upon the type of account it is
dealing with.
So far this is only used in AccountSetupIncoming,
but later it can be added to other settings fragments.
There are still some issues with this, but I'd like
to check it in sooner than later to unblock other
work.

Change-Id: Iea675ad5c1727f32ca0baa270dfa793ab7109993
2014-01-29 11:20:53 -08:00
Tony Mantler
6dc94f657e Merge "Remove obsolete debugging code" into ub-mail-master 2014-01-22 18:26:47 +00:00
Tony Mantler
c73e92cd6d Add missing dimensions to base resource file
b/12664658

Change-Id: I40b4cc91d5ed9deaeb3dc897a4f69d88d9613072
2014-01-21 13:50:56 -08:00
Tony Mantler
5bbbe11596 Remove obsolete debugging code
Change-Id: I522a5a67ac0f4cf54834e03fd1ff1fe7f580c943
2014-01-17 14:59:33 -08:00
Tony Mantler
7e4daecc9a Merge AccountSetupNames and AccountSetupOptions
Change-Id: I5946e90e56b1fc725522d41e2e33d8125900a871
2014-01-16 14:18:58 -08:00
Andy Huang
c15da7a99f fix misspelling in widget preview asset
Bug: 12191972
Change-Id: I62606a89f896ecdc21c1f42de2818c408db2dd56
2014-01-13 11:53:00 -08:00
Tony Mantler
499ac7b063 Split AccountSetupOptions into Activity and Fragment
Change-Id: I995c24315a26d14fbff9f1acd1bb7711403f418c
2014-01-10 16:43:36 -08:00
Tony Mantler
9fad8219da Split AccountSetupBasics into Activity and Fragment
Change-Id: Ib002d84497517b2e5687515693c0e1085b110c85
2014-01-08 15:50:42 -08:00
Martin Hibdon
3857d4d1cb Correct a comment in the oauth.xml file
Change-Id: I210508a6806a5bd1a716f0378d37003220585e6c
2014-01-08 10:09:22 -08:00
Baligh Uddin
1a6b640a21 Import translations. DO NOT MERGE
Change-Id: I93a04c0e0a4acc61f24aae40695c2e2fd1cd56a7
Auto-generated-cl: translation import
2014-01-06 20:25:55 -08:00
Tony Mantler
885ec98307 Merge "Split AccountSetupNames into Activity and Fragment" into ub-mail-master 2014-01-03 20:57:01 +00:00
James Lemieux
d0e19a2913 OAuth button moved to the 2nd line for tablet displays.
b/12083283

Change-Id: I6dfe45d559b5fe9b134a10c6822dbe8198f23854
2013-12-19 14:46:49 -08:00
Tony Mantler
aaa5b71cec Split AccountSetupNames into Activity and Fragment
Change-Id: Ie42bbbc0c5a4cc5402d6df2837894b5eddd52501
2013-12-16 14:52:32 -08:00
Baligh Uddin
f9b521391b Import translations. DO NOT MERGE
Change-Id: I81d7c513dfd9428d33c00ff27803c4d480131d18
Auto-generated-cl: translation import
2013-12-16 13:38:27 -08:00
Tony Mantler
10a5f9dba0 Merge "Make intents more explicit" into ub-mail-master 2013-12-09 18:28:59 +00:00
Tony Mantler
fb9deb96c3 Make intents more explicit
also fix intent strings.

Change-Id: I880fd6cd6192ae43002e1ddc8558f823141c5952
2013-12-09 10:18:34 -08:00
Martin Hibdon
874d25ff70 Add temporary code to do oauth authentication
This just adds an oauth button to the accountSetupBasics
screen, which will launch a webview and go to the google
authentication page.

Change-Id: I09d5182fa6081fb94b40e7910b71afbbee70387e
2013-12-06 17:39:23 -08:00