Tony Mantler
d44a802928
Merge "Save setup flow state when persisting activity state." into ub-mail-master
2014-01-22 18:27:42 +00:00
Tony Mantler
6dc94f657e
Merge "Remove obsolete debugging code" into ub-mail-master
2014-01-22 18:26:47 +00:00
Tony Mantler
e7f938d85c
Save setup flow state when persisting activity state.
...
b/12664693
Change-Id: I90c98f720b4d1976f1982e778370a4218fa9832c
2014-01-21 15:13:53 -08: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
Martin Hibdon
018ae522d7
Merge "Update email version number" into ub-mail-master
2014-01-14 18:48:06 +00:00
Martin Hibdon
af890a7bdc
Update email version number
...
Change-Id: I479836bef30877942626d26acc9eb0e64d8cff4d
2014-01-13 17:26:32 -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
bc089edacf
Merge "Split AccountSetupOptions into Activity and Fragment" into ub-mail-master
2014-01-13 19:16:03 +00:00
Tony Mantler
499ac7b063
Split AccountSetupOptions into Activity and Fragment
...
Change-Id: I995c24315a26d14fbff9f1acd1bb7711403f418c
2014-01-10 16:43:36 -08:00
Martin Hibdon
d710956640
Merge "Allow the quick response fragment to be displayed" into ub-mail-master
2014-01-09 22:06:16 +00:00
Martin Hibdon
0c7ff00df4
Allow the quick response fragment to be displayed
...
b/12442602
Change-Id: Iebd3ea3cd7b4120ae1690f8aba25d78e03d64b58
2014-01-09 13:58:16 -08:00
Martin Hibdon
6ae3bbfb72
Merge "Fix an oversight that wouldn't let us use oauth for dasher" into ub-mail-master
2014-01-09 21:52:36 +00:00
Tony Mantler
f8b253d564
Merge "Split AccountSetupBasics into Activity and Fragment" into ub-mail-master
2014-01-09 21:51:07 +00:00
Martin Hibdon
3cba65acec
Fix an oversight that wouldn't let us use oauth for dasher
...
b/12457993
Change-Id: I1ec31a17e292a76b26db5b5e75c51929d38c1f2d
2014-01-09 13:43:40 -08:00
Martin Hibdon
0a8cba4700
Merge "Fix a crashing log line" into ub-mail-master
2014-01-09 19:33:31 +00:00
Martin Hibdon
c9ee5a389a
Fix a crashing log line
...
b/12471608
Change-Id: I6d78c21c362f83322bf156e59ccb0935ff572772
2014-01-09 11:30:23 -08:00
Tony Mantler
da821eefb7
Merge "Deduplicate Address class" into ub-mail-master
2014-01-09 17:30:38 +00:00
Tony Mantler
9fad8219da
Split AccountSetupBasics into Activity and Fragment
...
Change-Id: Ib002d84497517b2e5687515693c0e1085b110c85
2014-01-08 15:50:42 -08:00
Tony Mantler
877825cfb0
Deduplicate Address class
...
Change-Id: I50a6a61c78935a7ecfb56be0a5eaed644dea9ed0
2014-01-08 11:17:20 -08:00
Martin Hibdon
2043ad73ef
Merge "Correct a comment in the oauth.xml file" into ub-mail-master
2014-01-08 18:45:10 +00:00
Martin Hibdon
3857d4d1cb
Correct a comment in the oauth.xml file
...
Change-Id: I210508a6806a5bd1a716f0378d37003220585e6c
2014-01-08 10:09:22 -08:00
Martin Hibdon
3f1d67533b
Merge "Fix a privacy violating log" into ub-mail-master
2014-01-08 18:07:38 +00:00
Martin Hibdon
4e952d9cf4
Fix a privacy violating log
...
Change-Id: I0c49fde90e4c14e6751a927d0963533092fbef52
2014-01-08 09:30:16 -08:00
Martin Hibdon
afecc01461
Add some logging to figure out why oauth signup fails
...
Change-Id: Ie706c54c1fb78c4da94cea091201d715251e1c46
2014-01-07 17:29:23 -08:00
Andrew Sapperstein
e684f7d03c
Merge "Support inline image UI changes in Email b/5555553" into ub-mail-master
2014-01-08 00:56:09 +00:00
Martin Hibdon
78d168c19d
Fix a crash bringing up settings
...
Change-Id: If29fc7a4113ed7245cd82e6b26c63f08f4b9db2d
2014-01-07 16:41:43 -08:00
Baligh Uddin
f2e9e37cf0
am d2d5e795: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd2d5e795ecfa064fa059c55210fd0d7a576b4604':
Import translations. DO NOT MERGE
2014-01-07 17:48:04 +00:00
Baligh Uddin
ac96f9cfc7
Merge "Import translations. DO NOT MERGE" into ub-mail-master
2014-01-07 17:44:34 +00:00
Baligh Uddin
e6550a36be
am 343be13b: (-s ours) Import translations. DO NOT MERGE
...
* commit '343be13b6e9528558125a3e4dccfa9bc9e2a9f72':
Import translations. DO NOT MERGE
2014-01-07 08:40:57 -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
Baligh Uddin
d2d5e795ec
Import translations. DO NOT MERGE
...
Change-Id: Icee51450a3ccbe66dc990988d60c8991597a3587
Auto-generated-cl: translation import
2014-01-06 20:23:07 -08:00
Baligh Uddin
343be13b6e
Import translations. DO NOT MERGE
...
Change-Id: I8685484c792c50162e47c9d2c2590a9ebc9329eb
Auto-generated-cl: translation import
2014-01-06 20:18:59 -08:00
Martin Hibdon
04f0be10d8
Update email version number
...
Change-Id: I24f315f6d6a383acf74d7b9ecf07c3f4020db24c
2014-01-06 15:48:17 -08:00
Martin Hibdon
bc5a832da1
Allow oauth to be used for any account
...
This is needed to allow authentication for dasher accounts.
Change-Id: Ic743cf5e027cb9dfbc85896ebae975a3ea40d7bc
2014-01-06 15:41:45 -08:00
Tony Mantler
e31fe0d47b
Typo: CONVERSATION_PROJECTION_QUERY_CURSOR_WINDOW_LIMT
...
Change-Id: I5e28bc618a38e12f171b12f71352838b4f27dbbc
2014-01-03 15:44:12 -08:00
Martin Hibdon
37e2cbb005
Merge "Fix a case that would leak connections if an exception happens" into ub-mail-master
2014-01-03 22:47:20 +00:00
Martin Hibdon
9fe8131c3f
Fix a case that would leak connections if an exception happens
...
Change-Id: I9f50911344e04f22e15bf9ba0c95f4e1b1422923
2014-01-03 14:33:28 -08:00
Martin Hibdon
e8eb6e659b
Make OAuth work
...
Now you can authenticate your account using oauth
for google hosted accounts (e.g. google.com, gmail.com)
The setup ui is still not up to spec.
Change-Id: Ib2826653550a823b4d1b8739c1e483746cccbc22
2014-01-03 14:05:46 -08:00
Martin Hibdon
ff1ee36cb5
Close Imap connections when we are done using them
...
Also, clean up when we create and lose track of ImapStores.
Prior to this we were creating them often, and losing track of them,
which renders useless a lot of the complex logic in ImapStore devoted
to reusing connections.
Change-Id: I771d4e46d0c1cb9b605c43d9cbae6e52f5894745
2014-01-03 14:01:04 -08:00
Martin Hibdon
5f4fb9bb14
Merge "Close Imap connections when we are done using them" into ub-mail-master
2014-01-03 21:59:34 +00:00
Tony Mantler
885ec98307
Merge "Split AccountSetupNames into Activity and Fragment" into ub-mail-master
2014-01-03 20:57:01 +00:00
Andrew Sapperstein
aef86e3501
Support inline image UI changes in Email b/5555553
...
A small CL to make sure email keeps compiling
and has the same behavior as before.
If Email wants to support long press to view image,
additional work needs to be done on the email side
in order to enable the full functionality.
Change-Id: I8e7cbdf2a2eee452fe9597097b77db5c8052d7fe
2014-01-03 11:12:14 -08:00
Tony Mantler
129e122608
Merge "Disable the compose activity when there are no accounts configured" into ub-mail-master
2014-01-03 18:31:34 +00:00
Tony Mantler
82b784b7c1
Merge "Re-background loading in AccountSecurity" into ub-mail-master
2014-01-03 18:30:59 +00:00
Martin Hibdon
6348f97c4b
Merge "Fix a crash when bring up settings" into ub-mail-master
2014-01-03 17:42:54 +00:00
Martin Hibdon
e228a8bd7f
Merge "Log the stack trace if we do a DB operation on the UI thread" into ub-mail-master
2014-01-03 17:42:51 +00:00
Martin Hibdon
15b06c2080
Fix a crash when bring up settings
...
It is now required that any activity that extends
PreferenceActivity implement isValidFragment.
Change-Id: I3ef79430b7f176186493bd09af693b48f8c040a1
2014-01-03 09:30:44 -08:00
Martin Hibdon
ab29555b72
Log the stack trace if we do a DB operation on the UI thread
...
Change-Id: I0b9e7fff502ef5ee0f8b373cb3352958b8de08c2
2014-01-03 09:07:01 -08:00
