Tony Mantler
885ec98307
Merge "Split AccountSetupNames into Activity and Fragment" into ub-mail-master
2014-01-03 20:57:01 +00: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
Martin Hibdon
5de5354918
Update some error logging
...
Now it logs stack traces of exceptions, and does not use
exception.toString() as the format specifier, which can be
dangerous.
Change-Id: If841426067017c574c4aff88b8d8ae6b49ee867a
2014-01-03 08:54:34 -08:00
Tony Mantler
00219e9fb9
Make the notification coalescence set thread-local
...
b/12197387
Change-Id: I36e49f43fa405e14bf507ef46e0d7c825240b628
2014-01-02 16:16:08 -08:00
Tony Mantler
1a1064c488
Update target SDK to 19, and add uses-sdk tag for emailcommon
...
Change-Id: I9ec3cd29d841f82ba4d8466f1f3cdcc20b634626
2013-12-20 15:21:01 -08: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
65b3850706
Set image loading to "ASK_FIRST" for all accounts
...
b/12217358
Change-Id: If3664c29e5920f29a2bba0136d61ac5c0a2fe0dc
2013-12-19 09:50:01 -08:00
Tony Mantler
dc7fe8964c
Disable the compose activity when there are no accounts configured
...
b/10042454
Change-Id: I45767d3e727b4c1fe858d80ca2e063b491827302
2013-12-17 14:24:37 -08:00
Baligh Uddin
abeef55959
am 5e4b0e98
: (-s ours) Import translations. DO NOT MERGE
...
* commit '5e4b0e985ae3d830502c172c2148242430ebc2d6':
Import translations. DO NOT MERGE
2013-12-17 19:53:17 +00:00
Tony Mantler
2d92d29c9f
Clean up unused variables, sprinkle in some finals
...
Change-Id: I16126bbe2c56b63b332c3871f0e0731ae7940b55
2013-12-17 11:31:28 -08:00
Jerry Xie
685d037981
Merge "Disable, suppress, remove broken and obsolete Email tests" into ub-mail-master
2013-12-17 17:36:17 +00:00
Jerry Xie
7037a0bd3d
Disable, suppress, remove broken and obsolete Email tests
...
Change-Id: Ia4dcba1c6966f23dd2a15e69324b7345aed8f944
2013-12-16 18:18:51 -08:00
Tony Mantler
d7655067e4
Re-background loading in AccountSecurity
...
This time use a loader and post from onLoadFinished
b/11987449
Change-Id: Ibf64dbb6aebad4d5d7d8ee8cdb0980240b86ec35
2013-12-16 15:47:58 -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
Baligh Uddin
5e4b0e985a
Import translations. DO NOT MERGE
...
Change-Id: I88233ebb9c7ef1e36d94906b13d3b5b905019f9f
Auto-generated-cl: translation import
2013-12-16 13:37:09 -08:00
Tony Mantler
b9d071a493
Null check cursor
...
Mock provider is returning null on this query in testing.
b/12085240
Change-Id: Ifa5edc03707a6050acdbd5184a44409d46004e7e
2013-12-13 13:44:05 -08:00
Martin Hibdon
05723aa0f6
Don't put Credentials in HostAuth parcels
...
The problem is that exchange isn't compiled with this
change, so HostAuth parcels to or from exchange fail.
Ultimately, we'll need to probably create a HostAuth2
object or something along those lines. For now, just
change the format of HostAuth parcels back, so they
stay compatible with exchange, I'll figure out a real
solution later.
Change-Id: I9c8c8639b7b474fe82dfdc37a9e51a0451820105
2013-12-10 17:12:00 -08:00
Jerry Xie
2bf9590ddd
Fix SQLite update query
...
Change-Id: I54a5e2f29e1e171901e7087e27d132256460f0f5
2013-12-10 16:46:45 -08:00
Tony Mantler
b14f1a45a8
Merge "Convert SetupData into a retained fragment" into ub-mail-master
2013-12-10 19:24:16 +00:00
Martin Hibdon
76d90334ed
Merge "Update version number" into ub-mail-master
2013-12-10 00:50:20 +00:00
Martin Hibdon
af7f7130fd
Update version number
...
This also changes the version number format. Instead
of being a single increment each time, we're actually
encoding the date in the version number.
The format is now vvMMDDc
where vv is major version number
MM is the ordinal month number. This starts at 0 for each major release and
counts up for each month
DD is the day of the month
c is a code which increments per version, in case we have multiple releases
on the same date. This should start at zero.
Change-Id: I006745754614e9c72261035748a90a38871b67e6
2013-12-09 16:49:12 -08:00
Martin Hibdon
44a6fc31a2
Merge "Allow database to hold oauth credentials" into ub-mail-master
2013-12-10 00:27:32 +00:00
Martin Hibdon
0b25179dab
Allow database to hold oauth credentials
...
Change-Id: I127297fd78c7676995f1dcfa59fbbcafe4e72e8e
2013-12-09 16:18:28 -08:00
Tony Mantler
9c8c471f97
Convert SetupData into a retained fragment
...
This will keep it from being recreated quite as much while off-thread tasks are possibly mutating it.
Change-Id: Ic9873489906339c33a76b8a600c0fc28016debc4
2013-12-09 12:02:12 -08:00
Tony Mantler
471e792ab4
Merge "Pass projection into getVirtualMailboxRow() and getVirtualMailboxCursor()" into ub-mail-master
2013-12-09 18:45:58 +00:00
Tony Mantler
e046d47c53
Pass projection into getVirtualMailboxRow() and getVirtualMailboxCursor()
...
b/10912870
Change-Id: Ief5137d113e91ee66318effdf4359629a8133131
2013-12-09 10:39:18 -08:00
Tony Mantler
10a5f9dba0
Merge "Make intents more explicit" into ub-mail-master
2013-12-09 18:28:59 +00:00
Tony Mantler
1644749d1b
Merge "Clean up dead/weird code." into ub-mail-master
2013-12-09 18:22:08 +00:00
Tony Mantler
fb9deb96c3
Make intents more explicit
...
also fix intent strings.
Change-Id: I880fd6cd6192ae43002e1ddc8558f823141c5952
2013-12-09 10:18:34 -08:00
Tony Mantler
a4436636ba
Merge "Coalesce notifications while in applyBatch" into ub-mail-master
2013-12-09 18:06:31 +00:00
Martin Hibdon
c35e5257d8
Merge "Add temporary code to do oauth authentication" into ub-mail-master
2013-12-09 00:43:56 +00: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
Jerry Xie
d241290f0b
Add makefile for EmailTests
...
Change-Id: Ic441b5cea9efd0b714a00a69c5b8483ddd11fafa
2013-12-06 17:33:36 -08:00
Jerry Xie
b174976d59
Merge "Get Email units to compile" into ub-mail-master
2013-12-05 22:04:13 +00:00
Jerry Xie
17d3a29c9d
Get Email units to compile
...
Change-Id: I171a0e2421c5006d9862ad94f886932146547020
2013-12-05 11:11:21 -08:00
Martin Hibdon
5632d4449b
Merge "Add configuration for oauth providers" into ub-mail-master
2013-12-04 00:29:17 +00:00
Martin Hibdon
e62688f0d6
Add configuration for oauth providers
...
There is now an xml file that holds parameters for oauth
providers, and entries in providers.xml can specify that
they can use oauth.
Change-Id: Ibce5b207f83ce9c773f8f713be9e73bb068070ed
2013-12-03 16:27:08 -08:00
Tony Mantler
7161335e53
Merge "Don't use a loader here, because we'll crash when committing fragment transactions" into ub-mail-master
2013-12-03 23:13:13 +00:00
Tony Mantler
da6848056c
Don't use a loader here, because we'll crash when committing fragment transactions
...
TODO: Fix the foreground provider calls later.
b/11972196
Change-Id: I0af6455447a2b37ff08c449efc1abf508254df19
2013-12-03 13:50:56 -08:00
Yu Ping Hu
2e3751d47d
Reset version code for algol.
...
Change-Id: Ibb319994d32a98cc78ea70f93a29fdc11b64c032
2013-12-03 11:24:55 -08:00
Tony Mantler
57a821368a
Retrieve the user's real name from the system
...
Also use a loader instead of an async task.
Change-Id: Ie9c033be0807bebdb559d9ce255a49b52a00134a
2013-12-02 13:34:44 -08:00
Tony Mantler
34662f11b2
Save policy when saving account
...
Also add a loader to AccountSecurity, and ignore when a policy contains unsupported requirements.
b/11790165
Change-Id: Idd651153848eea3216656047c5aba3bbd750ca0a
2013-11-27 14:42:49 -08:00
Yu Ping Hu
a702a7bbd8
Merge "Fix account deletion when removing security policies." into ub-mail-master
2013-11-25 23:38:03 +00:00
Yu Ping Hu
a60550e0eb
Fix account deletion when removing security policies.
...
- Delete accounts, not just account data.
- Wait for PIM data to get deleted before proceeding.
- Reconcile after deleting an account.
Bug: 11856902
Change-Id: Ie52b7c583688bf48a33bcf6b4e555b8c055b476c
2013-11-25 12:50:28 -08:00