Merge commit '99df4d53b620fae871fd45aaf9b8f110cb4d4288'
* commit '99df4d53b620fae871fd45aaf9b8f110cb4d4288':
Block oversize attachments from being sent
* We were zero'ing the server id BEFORE the move, rather than
afterward; this is fixed in the current CL
Change-Id: I4a5f2b2de5794a110a8f657c80dfeac4955b5909
Merge commit 'b47d1a8a1ab880b49d027c77c0cd2929a9a96c2f' into gingerbread-plus-aosp
* commit 'b47d1a8a1ab880b49d027c77c0cd2929a9a96c2f':
Block oversize attachments from being sent
Merge commit '126c9216b13d915b24a057b5b50bb8ea9826ba7e' into gingerbread
* commit '126c9216b13d915b24a057b5b50bb8ea9826ba7e':
Block oversize attachments from being sent
* Now notification kicks Welcome, which knows which
activity to use.
* Extracted cancelNewMessageNotification
* Also fixed 2909215. There'll be only one XL activity on the app stack.
Bug 2945369
Bug 2909215
Change-Id: I2a7fec0d48a7618375cae55138ca51fefc70ff6e
- Don't show combined boxes when there's only one account.
- Show special mailboxes (e.g. drafts) right after inbox
and before regular mailboxes.
Bug 2941270
Change-Id: I03ba356f5f2367f0478133acc1f2e35d182d359c
* Clean up Controller.deleteMessage to work with new EmailContent
utility methods, and move out of the UI thread
* Add unit test for Controller.moveMessage
Change-Id: Ic49e2ecc7ef2252dd4d51f4c3b313b936fda78b6
- Changed the default theme to Light.Holo
- MessageCompose now has ActionBar.
- Removed unnecessary MessageCompose menu items.
- Also removed "Add Account" menu from MessageListXL.
(Use the + button on account settings)
- Fixed "calender response section invisible" bug.
Bug 2926517
Change-Id: Id27632ec82dad158f43b0903dbc2cb219188400d
* Attachments that come in with a file:// URI do not support the complete
set of OpenableColumns columns. To handle this better:
1. Obtain the openable values in two separate queries, in case one or
the other is supported (but not both).
2. If the size is not reported but it is a file:// URI, attempt to
measure it directly.
3. If the size cannot be obtained, do not upload the attachment
Bug: 2948965
Change-Id: Ic5160d39efd65eaca40ceba0dd93c3b035d2871e
* Use the standard resources for it
I've been putting this off because it's a UI issue and we don't know
the final look, but the current look is really hard to read.
* Also, don't use the dropdown, if there's only one account set up.
Bug 2883791
Bug 2950461
Change-Id: I0af2e98b2650fcbc83c8f7228505afa334bea209
* We can't run the AccountManager functionality of account backup
and restore in the unit tests, because IsolatedContext doesn't
mock the AccountManager; this leads to various NPE's when the
test is run
* These problems started, by the way, when we added POP/IMAP
account integration with AccountManager
* Since the AccountManager side of account backup/restore isn't
tested, we'll skip that part of the process when running unit
tests
Bug: 2873546
Change-Id: I94673913e66722ac70f3c49c51465122e98bf3d9
* Use ListView's CHOICE_MODE_SINGLE mode to select list item.
* Added a view that implements Checkable to change background
for selected item.
Change-Id: Id55999b3d024ad1852e2b8c6436cd22ef255cf95
isEasAccount now uses getProtocol(), so it works even if the hostauth
hasn't been restored yet.
Bug 2929896
Change-Id: Iee902c18ef59680d8a7d4622230489ec7946f38c
The default theme change to Holo caused a crash in MessageCompose,
because Holo has actionbar, which MessageCompose doesn't expect at
this point. Explicitly set theme to prevent crashes.
Bug 2945294.
Change-Id: Ic5f833690eeb1048e8c4c3ac7a42c2d454c61876
* Add ControllerService to Controller and call this from
AttachmentDownloadService to handle attachment loading
(It's a redo of I3a6c2a40. Submitting for mlbank, who had a trouble
with repo.)
Change-Id: I7c90761ec4e213d6dc331fc894c7b77e84ad43a6
This reverts commit 0e6d972641.
(It's a clean revert. Submitting for mblank, who had troubles with
repo.)
Change-Id: I843169f5dc3aff528c249035b3413b56ca552923
Some of the tests run code on the UI thread but check the result
on the test thread, without synchronization, which is wrong.
Mark the fields volatile to fix it.
Change-Id: I917493f10fc9a15da57cfbc1e65e8d8e2cffd850
They're needed for unit tests.
I was hoping this would solve some of the unit test issues, but it didn't look
like so. But still they're nice to have.
Change-Id: Ibf6ae78055560d27aac5934d567a17084de99d84
* Changed our queue from a TreeMap to a TreeSet that uses an easily
testable comparator
* Remove the ugly bit twiddling priority computation
* Test DownloadSet (the logic behind queue ordering, addition,
removal, query, etc.)
Change-Id: Ia8427900b8f39a243a5407349775802d0a4fad4f
