Martin Hibdon
a516bd820d
Update email version number
...
Change-Id: Id9b77db64b9ee414c326d576ad5c92c4e789da44
2014-06-09 15:50:52 -07:00
Tony Mantler
524e0a5fbc
am 73101f3a
: Fix OAuth when changing credentials from settings
...
* commit '73101f3a7bc1e735199a7c2c18358e9db9af0bca':
Fix OAuth when changing credentials from settings
2014-06-09 22:50:37 +00:00
Tony Mantler
73101f3a7b
Fix OAuth when changing credentials from settings
...
b/15521401
Change-Id: I7909389943c8e3eefbef0699f1c7c9c338282ca5
(cherry picked from commit 994c282d80
)
2014-06-09 22:45:45 +00:00
Tony Mantler
994c282d80
Fix OAuth when changing credentials from settings
...
b/15521401
Change-Id: I7909389943c8e3eefbef0699f1c7c9c338282ca5
2014-06-09 15:28:11 -07:00
Baligh Uddin
fd6c63d18f
Import translations. DO NOT MERGE
...
Change-Id: Ide656b0a564018891e08956d553e82f14d617e29
Auto-generated-cl: translation import
2014-06-09 13:33:23 -07:00
Baligh Uddin
c3a639ce91
Import translations. DO NOT MERGE
...
Change-Id: Ie8fbca1da0cb04980f23c95b2c378e41638e9629
Auto-generated-cl: translation import
2014-06-09 13:32:07 -07:00
Baligh Uddin
c57f443ff0
Merge "Import translations. DO NOT MERGE"
2014-06-07 04:18:57 +00:00
Baligh Uddin
0f1d3a8f11
Merge "Import translations. DO NOT MERGE" into ub-mail-master
2014-06-07 04:18:53 +00:00
The Android Automerger
8a44b92af3
am 2e8400c2
: merge in master-release history after reset to 1f2c8cd7c3
...
* commit '2e8400c21174af2955ca3e4cf7c8035d4a0830d7':
Fix URI comparison
Revert "email: add support for Server Name Indication (SNI)"
2014-06-06 15:41:57 +00:00
Anthony Lee
11708a64a5
Merge "Some more cleanup and code rearrangement & added unit tests for ServiceCallback." into ub-mail-master
2014-06-05 23:41:56 +00:00
Anthony Lee
39e3bd63b5
Some more cleanup and code rearrangement & added unit tests
...
for ServiceCallback.
Change-Id: I6017e50455df3dda9ef6ec54ffd4fbc4e9b1a2d9
2014-06-05 14:57:44 -07:00
Tony Mantler
458c753c27
Merge "Clean up cert activity handling" into ub-mail-master
2014-06-05 21:19:15 +00:00
Martin Hibdon
6af16d627d
am 5369b102
: Update version number
...
* commit '5369b102c7685d7e8c2ed6352ae48bc84f9283d7':
Update version number
2014-06-05 20:32:27 +00:00
Tony Mantler
f765f9b976
Clean up cert activity handling
...
Fix re-displaying the dialog on orientation change b/5622284
Add host/port when available b/4988512
Disambiguate intent between AOSP and EmailGoogle
Change-Id: Ideeda20dfd9bd0070998ccf42d8042765866ca0e
2014-06-05 13:21:08 -07:00
Martin Hibdon
5369b102c7
Update version number
...
Change-Id: Ic18cd52ffdfe2905a7d9510f41f1331c2ef11675
2014-06-05 13:16:45 -07:00
Greg Bullock
9909fabcc6
Switch to using automatic resource namespaces for drawables and services.
...
Change-Id: If90089be6be004c87bdda5a5c3ed036a48205229
2014-06-05 17:25:51 +02:00
Martin Hibdon
43ab1020f1
Merge "Delete obsolete code" into ub-mail-master
2014-06-04 21:00:29 +00:00
Baligh Uddin
507d5fe12b
Import translations. DO NOT MERGE
...
Change-Id: I41875186f162d7a1d458cf662aeb5aade4197845
Auto-generated-cl: translation import
2014-06-04 13:18:16 -07:00
Baligh Uddin
b0b17a20b0
Import translations. DO NOT MERGE
...
Change-Id: Ic6f144c604e25d07419b30bfebedde698aefcff9
Auto-generated-cl: translation import
2014-06-04 13:16:50 -07:00
Martin Hibdon
fcb9d58129
Delete obsolete code
...
PartRequest was only used by obsolete Exchange code.
Change-Id: I708648c24c8b1af37928131186b8a84ff23dd3ef
2014-06-04 11:41:13 -07:00
Baligh Uddin
5c0e0c47b2
Merge "Import translations. DO NOT MERGE" into ub-mail-master
2014-06-04 04:53:13 +00:00
The Android Automerger
bdf451528c
merge in ub-mail-master-release history after reset to 3f553c4729
2014-06-02 20:00:11 -07:00
Baligh Uddin
7dfa1c6dcf
Import translations. DO NOT MERGE
...
Change-Id: I439dbd842735d5ef2e118b863ccd32114312fbc2
Auto-generated-cl: translation import
2014-06-02 14:33:17 -07:00
Baligh Uddin
cb0ed2fbae
Import translations. DO NOT MERGE
...
Change-Id: I467cae44fccbec920398f8289ba711318f65ba84
Auto-generated-cl: translation import
2014-06-02 14:31:35 -07:00
Alan Lau
3f553c4729
am 07e0bf5c
: (-s ours) DO NOT MERGE Adding data to the pending intent for notification action. This is now needed because Wear allows users to perform action on each conversation and therefore the pending intent can\'t be shared.
...
* commit '07e0bf5c74aaba7651deec64b5b7b8956a5e9d9d':
DO NOT MERGE Adding data to the pending intent for notification action. This is now needed because Wear allows users to perform action on each conversation and therefore the pending intent can't be shared.
2014-06-02 17:47:50 +00:00
Alan Lau
07e0bf5c74
DO NOT MERGE Adding data to the pending intent for notification action. This is now needed
...
because Wear allows users to perform action on each conversation and therefore
the pending intent can't be shared.
Bug 15344221
Change-Id: Ib6d3f17ba64c1a8a14ab9abe56b2d8168c7b9558
(cherry picked from commit 10d73dbe18
)
2014-06-02 17:17:23 +00:00
Alan Lau
3355e58f56
am 10d73dbe
: Adding data to the pending intent for notification action. This is now needed because Wear allows users to perform action on each conversation and therefore the pending intent can\'t be shared.
...
* commit '10d73dbe18873bbea41608072544e251cb89d85c':
Adding data to the pending intent for notification action. This is now needed because Wear allows users to perform action on each conversation and therefore the pending intent can't be shared.
2014-05-31 02:18:57 +00:00
James Lemieux
a8c8a745a8
Merge ""No quick responses available" should display when all quick responses are deleted" into ub-mail-master
2014-05-30 22:46:22 +00:00
Martin Hibdon
a6e65290be
Merge "Change IEmailService.sync to have two different forms" into ub-mail-master
2014-05-30 22:15:54 +00:00
Anthony Lee
e8cdcc7250
Merge "Cleanup of AttachmentService code and enabling of DownloadQueue." into ub-mail-master
2014-05-30 22:06:49 +00:00
Alan Lau
10d73dbe18
Adding data to the pending intent for notification action. This is now needed
...
because Wear allows users to perform action on each conversation and therefore
the pending intent can't be shared.
Bug 15344221
Change-Id: Ib6d3f17ba64c1a8a14ab9abe56b2d8168c7b9558
2014-05-30 14:50:33 -07:00
Martin Hibdon
163323294e
Change IEmailService.sync to have two different forms
...
Change-Id: Id8e770154d6116b02746cbdfb8c7cdc9358398de
2014-05-30 14:49:47 -07:00
James Lemieux
6dce0b1819
"No quick responses available" should display when all quick responses are deleted
...
b/14239989
We take advantage of ListView's feature that displays an entirely different
view in place when the backing Adapter is empty. The empty view is simply a
TextView displaying "No quick responses available".
Change-Id: I244ffd21fc4c1557c73979d4bb7c99306b11ebb2
2014-05-30 14:49:05 -07:00
Anthony Lee
e33511699a
Cleanup of AttachmentService code and enabling of DownloadQueue.
...
Removed unused functions, 'final'ed variables and parameters,
revisited some thread synchronization. Effectively no new code
introduced so no unit tests for this CL.
Change-Id: I714724a98d31a231ab10b0ad468b8efaa460bd1d
2014-05-30 13:26:08 -07:00
Baligh Uddin
497553627c
am 938c6ffa
: (-s ours) am d1b549dc
: (-s ours) Import translations. DO NOT MERGE
...
* commit '938c6ffa9ba4d2db84d4cea5e0409627f31be231':
Import translations. DO NOT MERGE
2014-05-30 02:53:56 +00:00
Baligh Uddin
938c6ffa9b
am d1b549dc
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd1b549dc14e4f26121ebaff435f7cfd62061b303':
Import translations. DO NOT MERGE
2014-05-30 02:52:13 +00:00
Baligh Uddin
d1b549dc14
Import translations. DO NOT MERGE
...
Change-Id: Ie565f9a9be1a75e2afda530a48c03875e4c151f7
Auto-generated-cl: translation import
2014-05-29 19:45:22 -07:00
Martin Hibdon
13d3a42d94
am 636a20a7
: Bump version number
...
* commit '636a20a7276fd28f1ac682d10bf343161a1c5bc6':
Bump version number
2014-05-29 20:42:58 +00:00
Martin Hibdon
636a20a727
Bump version number
...
Change-Id: I2831b14d1e6a612f05caf285aaa1253e757f0890
2014-05-29 13:40:37 -07:00
Geoff Mendal
7a3c839e14
Import translations. DO NOT MERGE
...
Change-Id: If526d2f01aa800b27e0ea4506f5c5a183e2baef7
Auto-generated-cl: translation import
2014-05-28 13:53:14 -07:00
Andrew Sapperstein
970b4b7eb2
am 4e6aa252
: Merge "Support hooks for new contact photo source." into ub-gmail-ur13-dev
...
* commit '4e6aa25286d9971e9574d5e3470ad99a15cf93ce':
Support hooks for new contact photo source.
2014-05-28 19:41:13 +00:00
Andrew Sapperstein
4e6aa25286
Merge "Support hooks for new contact photo source." into ub-gmail-ur13-dev
2014-05-28 19:38:41 +00:00
Jay Shrauner
f3440d33a9
Fix NPE in setAccountPolicy
...
Check for null returned by Account.restoreAccountWithId as with other places
where it is called.
Bug:15286267
Change-Id: I56d59564a1fa814f5c52b44c12303014eea2b0b0
2014-05-27 14:05:56 -07:00
The Android Automerger
8af82f1282
merge in ub-mail-master-release history after reset to 4ce1fc7669
2014-05-26 20:00:11 -07:00
Tony Mantler
4ce1fc7669
Disambiguate settings intents
...
b/13325901
Change-Id: I2843a6bfdac4acbabc758ddc44f1d980b7036aef
2014-05-22 14:31:22 -07:00
Tony Mantler
8b801e915c
Fix AOSP Email compile
...
Change-Id: Ic894b2c0534e09bf42662c49855fda39967958eb
2014-05-22 13:16:38 -07:00
The Android Automerger
2e8400c211
merge in master-release history after reset to 1f2c8cd7c3
2014-05-22 07:22:21 -07:00
The Android Automerger
1f37ba19c8
merge in master-release history after reset to 2b5156c427
2014-05-22 05:50:50 -07:00
Baligh Uddin
1f2c8cd7c3
am 6aa1f584
: (-s ours) am 4a5af4bc
: (-s ours) Import translations. DO NOT MERGE
...
* commit '6aa1f584f84c4d15d38513a56e11e7161ca13b43':
Import translations. DO NOT MERGE
2014-05-22 03:24:15 +00:00
Baligh Uddin
6aa1f584f8
am 4a5af4bc
: (-s ours) Import translations. DO NOT MERGE
...
* commit '4a5af4bca2613106ba27b3621998df9ed5c47b71':
Import translations. DO NOT MERGE
2014-05-22 03:15:37 +00:00