| 3b965d78774a42358ce6bbdcc43b4c8df130a60e |
|
25-Jun-2013 |
Scott Kennedy <skennedy@google.com> |
Clean up a bunch of warnings
Bug: 9565838
Change-Id: Ie3a380581e81c63aaa0764875c55bfdccd5f2b13
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| fa34c8679c81e1b656a14ab0a00775a8dbb2c7cb |
|
06-Apr-2013 |
Scott Kennedy <skennedy@google.com> |
Merge "Cleanup" into jb-ub-mail-ur9
|
| 21970daede1dcd7580adf6245df72f455ed09d2a |
|
06-Apr-2013 |
Paul Westbrook <pwestbro@google.com> |
Fix problem adding attachment
If the content provider doesn't support the OpenableColumns we
still need to attempt to add the attachment
Bug: 8558009
Change-Id: If687d5c3a1ce011461eeda1878a123e4f779520c
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| ff8553f20964f4c31b0c503a9e1daff6ae08a9c7 |
|
06-Apr-2013 |
Scott Kennedy <skennedy@google.com> |
Cleanup
Change-Id: Iee8abf75639450d469632e43fe0e102b687558db
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 02a653d50ec553acf629069ac0ac2348e09077db |
|
21-Mar-2013 |
Alon Albert <aalbert@google.com> |
Try to get size of non content:// Attachments
Change-Id: I2e8a73815bba36783bc50e1e3edddc909ecc72b0
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 8750066b10f80e2a8080016973b3296d76d18266 |
|
20-Feb-2013 |
Mark Wei <markwei@google.com> |
Set MIME type correctly on drafts when content provider does not provide it.
Bug: 8235172
Change-Id: I7bbccbecb7d038f3add4503be0dcf460a4864b2e
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 3ca3bf8538bbabcaf9d86818e25c40f3a9d9b0c9 |
|
29-Jan-2013 |
Mark Wei <markwei@google.com> |
Fix crashes related to sending or forwarding attachments.
Attachment contentUri will always be a content:// uri, not the file path.
SERVER_ATTACHMENT will generally be under Gmail.AUTHORITY while LOCAL_FILE will
have a non-Gmail uri.
Attachments as part of a draft that becomes updated into a message are now
viewable. They will be a LOCAL_FILE that points to the non-Gmail contentUri of
the uploaded file. They will not attempt to be downloaded again. They will have
a fake partId and uri so that they can be viewed.
We make sure thumbnailUri and contentUri are always populated with the correct
default contentUri (for SERVER_ATTACHMENT).
The cachedFileUri is now also used for SERVER_ATTACHMENT. It points of the uri
of the downloaded file.
Bug: 8076816
Bug: 7960494
Change-Id: Ia73144886c6a730987bf6fe7b2326e6820f4e2f6
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 32f5d8a714358b617d7676394b8fb084d6f06594 |
|
17-Sep-2012 |
mindyp <mindyp@google.com> |
We need to get the children of the bar list, no the children of the attachment view.
Videos are children of the bar list.
Fixes b/7165581 Attaching videos doesn't focus the view to the recently attached item
Change-Id: I33555851c8c390a864c0ec68ddcd43e7460e1d93
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 62066e47fe69c33b60ed970e46809ba81d044064 |
|
13-Sep-2012 |
Mark Wei <markwei@google.com> |
Prevent photos attached during Compose from showing generic thumbnail briefly.
Cache the loaded previews on save instance state, so when the configuration
changes, we don't have to re-download all the previews.
Bug: 7140604
Change-Id: Ic3fd640cb0116729868548cdd620b67bc06f3967
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| d8401e4849df494b815578bc4cc320013337c727 |
|
11-Sep-2012 |
mindyp <mindyp@google.com> |
check if the attachment is tiled before trying to find it in the tile grid view.
Videos, etc are not tiled.
Fixes b/7138477 Gmail Crashes after composing a mail followed by tapping a video thumbnail
Change-Id: I0fc231acbe6eb8aab429415abf5d9fb75ca05eab
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 40882430c874ff29890ec6fa31f7649788cbc470 |
|
06-Sep-2012 |
mindyp <mindyp@google.com> |
Move attachments below compose body, above quoted text
Remove collapse/ expand bar
Fixes b/7087015 attachment layout questions for phone and tablet
turns out there are no add'l changes for tablet
Change-Id: Ieb24b0e743a9d95b1b69b2413c44d80415cfe673
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 434f294a3ae17a4f76342af38d6376f672a5d9ed |
|
24-Aug-2012 |
Mark Wei <markwei@google.com> |
Better wording for file too large error text
Add error resource field to AttachmentFailureException to differentiate between
3 different cases of file limit. String resources use formatting for different
max file size limits.
Bug: 6923821
Change-Id: If824e06a28c91760fbfb1909cbd191cad4b6dd50
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| dcf63176a710c5cc5113e7763b12ffeba5630038 |
|
10-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Fix b/6966778.
Wrapping enableTransitionType/disableTransitionType
in API version checks.
Change-Id: I45bd0c9473e2c1fbd705c5b956fab7d3940b4645
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| ca87d6d907e6d00670c8af607cf82cf7a73f7b39 |
|
09-Aug-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Improved the attachment composition animations.
Now, we only set the CHANGING animation on demand
and always turn it off after the completion of the
animation. We also set delays as necessary before
the animations start and always turn delays off after
animations.
Change-Id: I4773c8ea511634f52ed963c76007cdad7194541f
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| e7d87dda85e55d1cd40a840c7d99aef73c65641d |
|
17-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Changing from forward to reply removes attachment.
Previously, I forgot to also set the visibility of the
AttachmentsView to gone when deleting all attachments.
That is now being done.
Change-Id: I17a451b762d7bcd54ae57f77334e9a4bccf52c54
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 3cd4f40dab2c0810cb5ecd77256abf022863b2b5 |
|
17-Jul-2012 |
Mindy Pereira <mindyp@google.com> |
Allow providers to supply max attachment(s) size for new messages
Also, general cleanup around attachment exceptipons.
Moved showing the error toasts to the composeactivity.
Change-Id: Icd829146b60ed5656bed0d6d570fafbf5d0956fd
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| ce2a25c96f9274d9c2944a5d197a3d3dd75d71ea |
|
16-Jul-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Hide IME when expanding attachments in compose.
Change-Id: Ic8cac494529bf4abce8ec0d41143b5554d666bc7
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| b334c9035e9b7a38766bb66c29da2208525d1e11 |
|
25-Jun-2012 |
Paul Westbrook <pwestbro@google.com> |
Changes to support different Log tags
Change-Id: I7121fbf7132444fc0f5c0c130373e3f2d1a3cf7a
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 226e4fd316954167654b207aba998b7a7e43ade9 |
|
21-Jun-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Made collapse/expand a manual action.
It now opens and closes based upon user interaction
alone rather than on focus. Also, the header is always
visible, even when all of the attachments are visible.
Clicking it causes the attachments to collapse.
Change-Id: Icec76f8260241c7bceb39209c60625c4d96a9d0d
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 2ea06183aa826b28fe6ebdb454da49ba3878bc4f |
|
20-Jun-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Collapsing attachments in compose now works.
When the draft has attachments, if the focus
on any of the text fields changes, the attachment
area collapses into a smaller area. Tapping that area
causes the attachments to expand into the full view
with the previews. Some refactoring was necessary to
enable reuse of the thumbnail loading for the small
preview icon.
Change-Id: Iaefb71736a2359b9090b2fe736ad2f33a9838ed7
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 237129ddf57a1e25469d8990322fb7913e18ae20 |
|
15-Jun-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Compose now shows images as tiled attachments.
It's still a bit buggy (notably, once the previews
do not show up after the initial attaching). Those bugs
will be fixed in the next commit but this was a good stopping point.
In order to reuse as much code as possible, the AttachmentTileGrid
was moved into com.android.mail.ui. Additionally, MessageAttachmentTile
was split into AttachmentTile and MessageAttachmentTile. AttachmentTile
is a base class that handles all of the tile interaction that is common
between the browse and compose versions. At present, this is mostly
the fetching and displaying of the preview image.
As a result, MessageAttachmentTile now derives from AttachmentTile.
MessageAttachmentTile handles the interaction specific to browsing
messages (such as opening the photo viewer, etc).
There is also new class called ComposeAttachmentTile
which derives from AttachmentTile and handles the interaction
specific to composition of messages.
The AttachmentsView in composition now contains two children in its
view hierarchy, an AttachmentTileGrid and an inner LinearLayout
that now stores the non-tiled attachments.
Change-Id: Iad85529a7b6d573060645499271860cf07877754
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 0b8b7df1c3d8fe3b60a0fea4623243036bab9849 |
|
10-May-2012 |
Andrew Sapperstein <asapperstein@google.com> |
Removing email address from source.
Change-Id: I19b4c474921318c2b891613d99f1a49a77dac168
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 5c5fd571b40a15b95ea5a5d6033f377706ffd0fb |
|
09-Apr-2012 |
Andy Huang <ath@google.com> |
compose attachment refactor
This is step 1 to modernize attachment handling in Compose.
This CL tries to have Compose view deal in Attachment objects
rather than the raw pieces like URI/name/size. For those cases
where the raw pieces are all we have (e.g. incoming intent),
AttachmentsView.generateAttachment() is now a single place for
this work.
When loading a saved draft or forwarding a message with
attachments, since those Messages already have fully populated
Attachment data available via getAttachments(), use that.
Mark various Gmail-style joinedString representation variables
and methods deprecated in favor of passing JSON in
ContentValues when necessary. The next step is to beef up the
supported fields in the attachment JSON and have send/save pass
JSON and have providers read JSON.
Bug: 6305925
Change-Id: Ie8fb9ce27d71a10a6ea8ae431b78e61ffe5933e2
Conflicts:
src/com/android/mail/compose/AttachmentsView.java
src/com/android/mail/compose/ComposeActivity.java
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 5e1a5b7a9d694ff812e65f4b1240366252cdcde7 |
|
12-Apr-2012 |
Paul Westbrook <pwestbro@google.com> |
Fix error when sending attachments
This fixes Gmail's caching attachments when sending
Bug: 6324561
Change-Id: Icc038d46063f486518b4858a2d0670795bbf332a
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 8eca57a78ae01d9c8f55226734131aac1ff3c8ae |
|
21-Mar-2012 |
Mindy Pereira <mindyp@google.com> |
Handle intents in compose.
Change-Id: I669e9c372856cbf0f3fdab2130ccaf2fdb0d2515
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 1eb5f96d4e9c459d463d664563c755ec36f958f7 |
|
10-Mar-2012 |
Andy Huang <ath@google.com> |
cross-project refactoring
Attachment.mimeType -> contentType
Attachment.contentUri(String) -> contentUri(Uri)
Change-Id: I333453943914c241c63f9ec0a3824150e52706fd
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| e0b83b8d9d2e5930a9453173a8b1da63c57f6db7 |
|
07-Mar-2012 |
Andy Huang <ath@google.com> |
Flesh out attachment download details
Add columns to AttachmentColumns for the UI to initiate and
cancel downloads, and for providers to convey download progress.
Remove SYNCED column, as the joined-string representation of an
attachment contains "origin", which covers the same thing.
Remove ORIGIN_EXTRAS column, as the joined-string representation
already contains that info.
Change-Id: Id50ffbf07b867a1cd7e5fd40f171d45b556b197b
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| cfb7f33ff8ef9dc60b9143af32de64c7a3d71f36 |
|
28-Feb-2012 |
Mindy Pereira <mindyp@google.com> |
Store URI's in Uri instead of String.
Change-Id: I5492a61b80442afc7cebc5b3d560688aebae8820
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 1ddcf0f2bf44d3c9db89112ef52510d9b2433ac4 |
|
13-Jan-2012 |
Vikram Aggarwal <viki@google.com> |
Adding more ActivityController dependencies
ui.ControllableActivity added from Gmail.
One pane layout files brought in.
Minor changes to make everything work with the test activity.
Change-Id: I8cacd5f36394fe4a786590e2e381369a3afb5494
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| f944e9655562e321aff52fe5f437e1d2fa2950a9 |
|
17-Jan-2012 |
Mindy Pereira <mindyp@google.com> |
Handle attachments on sent messages.
Change-Id: I13a2b9250b61fd059b4b3f92caff03c7a3614881
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 3ce64e7ceb6246130342385d91550bcf33b31cc8 |
|
13-Jan-2012 |
Mindy Pereira <mindyp@google.com> |
Create parcelable message.
Also, gets rid of and renames fields that required them per:
name change to appendRefMessageContent
remove custom_from field
remove quoted text pos
Change-Id: I33a2f83b906d2504a8a6ae58f79f1618bb8a20cd
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 7a07fb4955e34250225287212b07d1b6f12bf671 |
|
11-Jan-2012 |
Mindy Pereira <mindyp@google.com> |
More cleanup of compose activity; add attachments when forwarding.
Change-Id: Ib4290f95ccd38926c361a320dcaf8f66412e780e
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 7aee8f75f07eb39ecacdf0630d2199211aea5718 |
|
11-Jan-2012 |
Mindy Pereira <mindyp@google.com> |
Make attachment a parcelable object.
Change-Id: I1d0e446d5fa22b83ab103d3e162bc46c72492f4b
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 9932dee248718d2cec993d93b5115973d1389d0a |
|
11-Jan-2012 |
Mindy Pereira <mindyp@google.com> |
Cleanup attachments code.
This moves the bulk of attachment handling to the AttachmentView,
which means that email/ gmail can easily override behavior by
specifying a different/ extension of the AttachmentView in their
compose.xml overlays.
Change-Id: I8d9385f5431a04e21fd0f9de083ef84137998558
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| eaea9f16b2b61eed6b62fe9a5c567bfbe0d75d80 |
|
11-Jan-2012 |
Mindy Pereira <mindyp@google.com> |
Cleanup to simplify code; save on exit rules.
We had dupes of a number of things that we had to keep in sync.
Instead, we now use mAccounts and mAccount instead of mSelectedAccount
and mReplyFromAccounts, and mAttachmentsChanged instead of mAttachAddedOrRemoved.
Also takes care of save on exit logic (first part) without
defininf the recipientedittextview specific text watchers.
Change-Id: Ic08d8e91c12870cb1c2997c7d36d0b5e230437af
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|
| 30e2c24b056542f3b1b438aeb798305d1226d0c8 |
|
07-Jan-2012 |
Andy Huang <ath@google.com> |
rename unified email's package name to com.android.mail
New code needs a new package name. Fixes IDE conflicts when
browsing.
Change-Id: I328484c6d6c71df077a05d2f7d6d1e85074107c2
/packages/apps/UnifiedEmail/src/com/android/mail/compose/AttachmentsView.java
|