Cross Reference: /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java

History log of /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
Revision	Date	Author	Comments (<<< Hide modified files) (Show modified files >>>)
0d9a37e03c2b4cb0329863a97e4ce52c1a2c5a44	14-Oct-2014	Jin Cao <jinyan@google.com>	Fix html conversion failure check to use trim b/16489004 Change-Id: I6b4b998cae27fa8f0c20a3eff028b64977c15780 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
ae47d9251129515ec0d6e69d9dfc2f45a38f8f1c	09-Oct-2014	Andrew Sapperstein <asapperstein@google.com>	Set title for ComposeActivity. Helps with a11y. Fixes b/17934766. Now compose is read out when you enter compose instead of the app name. Change-Id: I3c41081b8c170a84f9ebf1b66b85673dd654a3c6 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
1bf89a7a5802be3bf9ead4c26db9b8b2ae04b433	09-Oct-2014	Jin Cao <jinyan@google.com>	Merge "Add autopan so FAB/other stuff won't get pushed up" into ub-gmail-ur14-dev
cfba4bb705440723bbc14a8371b75dcb82f79067	08-Oct-2014	Jin Cao <jinyan@google.com>	Add autopan so FAB/other stuff won't get pushed up Instead of using autoResize to resize when soft keyboard shows up, use a custom list view that takes visible display frame into account during onMeasure so that the listview itself will simply measure based on the available space. b/17916077 Change-Id: If2b771e59f67689a7431284a0ec05af6a04fd055 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
f14d8b33f649357f839f7b06db22ff3adef89c4f	08-Oct-2014	Jin Cao <jinyan@google.com>	Change status bar color for search b/17546831 Change-Id: Ib72000b6a2bcaa325dc2b82a819a7c823454a0d8 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
efd62cb7d4b42d0f88160600fc8c572054d1c4d5	03-Oct-2014	Jin Cao <jinyan@google.com>	Log when html conversion fails b/16489004 Change-Id: Iafebebd6dfab8a2e76a4405bfd87a3c7b0dc65f8 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
0a8e822ae945ad88ff1e7d81473d37c3ea24b406	02-Oct-2014	Jin Cao <jinyan@google.com>	Speculative fix for losing message body We make an assumption in ComposeActivity that a message's bodyHtml and bodyText are pretty much equivalent (bodyText is set from the raw content, and bodyHtml is set with spannedToHtml(content)). However, it's possible that for whatever the reason Html.toHtml might not return the correct result or errors out and returns an empty string. For example, looking at the implementation of Html.toHtml, it looks like if the html doesn't contain any <p> tags, then it will return an empty string. Use the actual bodyText as a fallback instead of setting the body based on the bodyHtml value. b/16489004 Change-Id: I4a05cd67b6c6e7c02404412da9fa27a14a486615 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
24c892ddd9ba0198225f444724a19bfaeba06246	29-Sep-2014	Jin Cao <jinyan@google.com>	Do not assume mAccount is the default email b/17530495 Change-Id: I74400454478049e17c002a35df798541df497c52 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
23ab6ea2283fba4b5dd8e79afef281f8ea28d19b	25-Sep-2014	Jin Cao <jinyan@google.com>	Capture ctrl+enter for send shortcut b/17596008 Change-Id: I077af88e432cd8f285f2207562759404adf1b506 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
e1dc3e7668389357915c615f2edfa1601005ad6d	19-Sep-2014	Andrew Sapperstein <asapperstein@google.com>	Expand drawer to be under status bar. b/17569398 Change-Id: I345095c4679f83a315bb3d5909b9d2d7fbece111 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
64981b4f8ca98e181fe68def7e425a29a86695bb	17-Sep-2014	Jin Cao <jinyan@google.com>	Merge "Properly implement requestIdToMessageId map" into ub-gmail-ur14-dev
83a634a6b80389a3e98dc72b2248cbfe3cee6961	16-Sep-2014	Jin Cao <jinyan@google.com>	Merge "Don't confirm if discarding empty message" into ub-gmail-ur14-dev
e0037929848b92e8dc4e310cac9f14e9ec4b88d6	16-Sep-2014	Jin Cao <jinyan@google.com>	Don't confirm if discarding empty message When the user chooses to discard a message in compose, don't ask for confirmation if the message has no content (subject, body, attachment). b/17496056 Change-Id: I597039dacf2afcb71d6dfd614c10e23025f901de /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
734718a4b2c86c0f5fe3e24113855b11aac6717e	16-Sep-2014	Andrew Sapperstein <asapperstein@google.com>	Set status bar color in CAB mode. b/17471621. Change-Id: If23bdce538aa647952d193a9976d6a27bcfd5829 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
31bb3d6262a072f55c505226ad3cb6384e22abf3	11-Sep-2014	Jin Cao <jinyan@google.com>	Properly implement requestIdToMessageId map Use requestId to messageId map to keep track of requests that complete after the activity is destroyed. This way, we don't lose track of the newly created message id for the current draft which may cause two versions of the draft being saved. b/17425799 Change-Id: Ib03303c9b76cdee655c1217ce1fc65b2e414f8c1 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
adae7a3dba5b136b0cf7054150af8502325dcb08	10-Sep-2014	Jin Cao <jinyan@google.com>	Forward uri permission for compose JB+, use setClipData to forward the permission to the Service so that we have the permission for the attachments for as long as the service is up. For pre-JB, call initializeAttachmentFds on the main thread to ensure that we get those attachments before the activity ends. b/17409336 Change-Id: Ic03c7fbfc39a6c54e96bff69a2c4914ac88361a8 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
aff451f2ae90c795313f00f7a04e6a6965fb5a87	09-Sep-2014	Jin Cao <jinyan@google.com>	Refactor out SendOrSaveTask sendOrSaveInternal is already run on a handler, so there is now no need to have SendOrSaveTask. Change SendOrSaveCallback accordingly since some of the args are no longer needed. This is a speculative fix for b/17425799 since we were double posting tasks to the same handler. As a result, there can be a race condition where the first SAVE posts to handler, doesn't complete in time before the second SEND posts to handler. Thus, the SAVE's SendOrSaveTask is run after the SEND runnable. b/17425799 Change-Id: I3a2379cb254854598c0d01aef1993e3d21d13788 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
7fa98c67d36ca68b19a7f1140fa0b79a3ab7b991	05-Sep-2014	Jin Cao <jinyan@google.com>	Merge "Allow calling package to attach files from its data dir" into ub-gmail-ur14-dev
ca9b980dcb0ea12bde26baab880a304a6a67091e	03-Sep-2014	Jin Cao <jinyan@google.com>	Merge "[Quantum compose] move top padding into scrollview" into ub-gmail-ur14-dev
95b8a7bde0b63125a5ef1bd6f0b5e5c6bb4ab724	03-Sep-2014	Jin Cao <jinyan@google.com>	[Quantum compose] move top padding into scrollview - Move the top padding into the scrollview content so it scrolls with as the view fills up. - Add the click listener for composearea_tap_trap_bottom so whenever it is clicked it focuses the body and places the cursor at end of the body. It looks like this is what it's supposed to do, but I don't know where that code went. b/17363410 Change-Id: Ib7228cf88c853293602baed3eca45f78d5bddb12 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
6d738bc56d3a69e5d82427d0f0a2fc958b8cf5cf	03-Sep-2014	Jin Cao <jinyan@google.com>	Merge "Only run htmlToSpan task if the body wasn't restored" into ub-gmail-ur14-dev
738cafe32b66ba18a188745d8f5f72011b005e99	03-Sep-2014	Jin Cao <jinyan@google.com>	More ComposeActivity logging Change all calls of mBodyView.setText to use setBody, and log whenever setBody is called so we can better debug issues with ComposeActivity (e.g. people losing their draft contents). Change-Id: I5b3329f51029ad8d7d07a3fe008b8980aa278a4b /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
24ed2941ab132e4156bd38f0ab734c81dae8fc2e	02-Sep-2014	Jin Cao <jinyan@google.com>	Allow calling package to attach files from its data dir For incoming intents with attachment uris, allow for files in the data directory if the directory is part of the calling package's data directory. b/17345059 Change-Id: I0841ce8375380f1ae4f929c811e5e4abecff9763 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
adea2c809c1a97d3948b131a6f36ee9b88039a45	28-Aug-2014	Jin Cao <jinyan@google.com>	Do not allow attachment from data directory When attaching files from intents, do not attach anything that belongs in the data directory. b/7154234 Change-Id: Ia68d626fcc9e734727424933d3f859ecc44bee78 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
1fdbe1fb8b258fd0d87106e9a890724b7c910f70	19-Aug-2014	Jin Cao <jinyan@google.com>	Only run htmlToSpan task if the body wasn't restored If the system restored our EditText by default, let's not override it by converting our saved HTML to Spanned because the framework's version will encompass everything we saved and more. Only do this for configuration change since we are ensured that the activity won't be destroyed. Also properly persist mTextChanged across screen rotations. b/16823273 b/17245535 Change-Id: Ib71cc2a240e4e77b08816a7e21a48548ae226b94 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
7800d2921fdd9b2c400d389076eaac09be5fc67c	24-Aug-2014	Jin Cao <jinyan@google.com>	Add logging to sendsave for compose Change-Id: I3ee2dedc35cf4b00fd355ce205653c516a1ce9c5 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
f0a0b4c82081018441b34b731da464914605ee64	21-Aug-2014	Jin Cao <jinyan@google.com>	Separate string for Compose action bar title Add new string and set limit to 10 chars (from my testing 10 is a the safe number depending on what characters are used). b/16873798 Change-Id: I9e98230267d6621abe2201077df8aee8d1f69928 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
d47a7043d685c69d30317245ac295f4cde5240d8	13-Aug-2014	Greg Bullock <gregbullock@google.com>	Prevent "attach from Drive" menu showing for non-gmail accounts. Change-Id: I4f289e60082d372a1662372768890772fe0d7633 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
14fd30499baaf37dc534cb330ac93275db8b1e83	12-Aug-2014	Greg Bullock <gregbullock@google.com>	Extract protected method to determine From field. Change-Id: Icf8902d38139ab3725226d1fe05f0122a285fec1 Bug: 16968834 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
f746163763d6403ca77e82f45763bbf02775903b	12-Aug-2014	Jin Cao <jinyan@google.com>	Use themed context for navigation modes b/16649947 Change-Id: I00ac831ec19f039d910ea5fdcdb4db1650514caf /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
15f09d77ffd14b53d17b6fb27b921c740f625846	08-Aug-2014	Jin Cao <jinyan@google.com>	[Quantum compose] custom anchor for to Add custom anchor for To field so the popup will have the full width of the field. b/16851158 Change-Id: I54cbd601d46c8d2fb3ee37956fb560dcb31905f9 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
52882ff08fe9420fe2dbb3f681545a330222e9c8	27-Jul-2014	Andrew Sapperstein <asapperstein@google.com>	switch to appcompat. b/16664350 Currently only for MailActivity, ComposeActivity, and FolderSelectionActivity. Any activity that inherits from ActionBarActivity must use an Appcompat-derived style. Three styles currently exist: UnifiedEmail.Appcompat, UnifiedEmail.Appcompat.Toolbar, and ShortcutWidgetTheme are all based on appcompat. go/appcompat-material-doc contains the full migration guide. The fast version is: All MenuItem-related work that relates to actions must use the MenuItemCompat-equivalent. Any theming should use the appcompat versions which don't require a namespace prefix. For instance, use actionBarStyle instead of android:actionBarStyle. There are a few missing styles on views that can't use appcompat versions. Those still use style overrides for v21 changes. All others use appcompat versions. A few methods on activity should now use the support equivalents: getSupportActionBar() supportInvalidateOptionsMenu() startSupportActionMode() Change-Id: Ic6f5964f4115ab4bde49c19df5fe49c9086df965 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
36e2387671123c74249446edbcb0e95022b83096	29-Jul-2014	Jin Cao <jinyan@google.com>	[Quantum compose] autoscroll to cc On phones when the user taps on subject/body with cc/bcc, we autoscroll so that cc aligns with the top and the subject/ body have enough space to not feel clumped. b/15934812 Change-Id: I5c44b409fd89e9e810bfc07d935579d36626e87d /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
c5c550aab639e948af20c2dd24d47959c86ac45d	29-Jul-2014	Jin Cao <jinyan@google.com>	[Quantum compose] Hide Cc/Bcc appropriately When subject/body is focused, hide cc/bcc if they are empty and show the addCcBccButton accordingly. b/15934812 Change-Id: Ia26faf09781eed5d117ee6e489025211179b366a /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
7d16f5feac48d086cad02306b8c34d45cb10750d	26-Jul-2014	Jin Cao <jinyan@google.com>	Merge "Quantum compose" into ub-mail-master
9d358a14db7dd2caf853ca978ea06ed82a84f87c	24-Jul-2014	Jin Cao <jinyan@google.com>	Quantum compose Temporarily using ic_forward_24dp as placeholder until I get the correct asset for the dropdown buttons. b/15934812 Change-Id: I760a1717a73f7c3ab1ad5a3368fac297e883231c /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
a42d98e57dfef340af3fa8f0223d444ecc7cf5c4	26-Jul-2014	Jin Cao <jinyan@google.com>	Merge "[Quantum] update compose action menu" into ub-mail-master
f8c02b689a62bcbbf9a5a565c283ddb6a33b6fd1	23-Jul-2014	Jin Cao <jinyan@google.com>	[Quantum] update compose action menu Remove out-dated compose menu items. b/15934812 Change-Id: I6949c3d973e7bea0a265406aca6fc66ae221a68e /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
a8f34ff28fb17c015e8c9238188617c5dd2e669f	24-Jul-2014	Jin Cao <jinyan@google.com>	Always append signature b/16520039 Change-Id: I98f2c849cf5534fd9e84fd96c4ad86adc01cc206 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
a9f5a8ee78d814846275541edc733379438e08e0	22-Jul-2014	Jin Cao <jinyan@google.com>	Potentially outdated code for saving message body Use message.bodyText instead of basing textBody on htmlBody. Use refMessage format iff the refMessage has either one of bodyHtml or bodyText set to nonempty value. This ensures that we properly save the current message in the case of empty refmessage body. b/16489004 Change-Id: I7a783120c12719238deae071885c44e5b401b947 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
32f453bf0a864cdbf796a9f25630836f45cca781	22-Jul-2014	Jin Cao <jinyan@google.com>	Ensure that we always execute HtmlToSpannedTask Speculative fix. There was one code path that doesn't execute HtmlToSpannedTask which is when the first quotedTextIndex check is > -1 but the second is not. This can definitely cause the body to not populate since the HtmlToSpannedTask is the only way to populate the body. b/16489004 Change-Id: Ieae789b38356d269a8f9dbb7bb7ae2aff29df1c5 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
4b0c0127d24e387a4f49d442b63b5c60cedb6922	11-Jul-2014	Ray Chen <raychen@google.com>	Delegate Account creation to builder class. Account contructors are no longer public and clients need to use Account.builder().buildFrom(...) instead. Change-Id: I8f072e893b49b64d962fa7a075e5c15364c4c05f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
4def3bfdadbab0ba96f713ef9878ce1028672637	01-Jul-2014	Paul Westbrook <pwestbro@google.com>	Fix action bar icon The action bar app icon is now suppressed both on pre-L and in L Change-Id: Ifcf416505622ae72f260049c0b1e4a1e972e5431 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
41c3a25165145c501cda67c156720c2f50b63685	30-Jun-2014	Tony Mantler <nicoya@google.com>	Don't try to format null in reply subjects Tested on Email and Gmail b/11810597 Change-Id: I76887a32add769a609fa90a17daf469a47b0c760 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
5043cc2ae07bbf82691101585084bb7f1334bb23	28-Jun-2014	Paul Westbrook <pwestbro@google.com>	On L devices hide app icon Change-Id: Ibe16fd44a1d5aeefec7c8b9a2c91f4a3f8d6fe9b /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
543dcb2880915bc1d1563a2df2399805f550a89b	25-Jun-2014	Ray Chen <raychen@google.com>	Merge "Implement support for help library b/12068507" into ub-mail-master
c825c1b98e5f416a95fea84171465eac86af374b	25-Jun-2014	Andrew Sapperstein <asapperstein@google.com>	am 22a3a312: Batch recipient lists. b/15857655 * commit '22a3a312a01118f78b1bc836b8f6008be052cbce': Batch recipient lists. b/15857655
22a3a312a01118f78b1bc836b8f6008be052cbce	25-Jun-2014	Andrew Sapperstein <asapperstein@google.com>	Batch recipient lists. b/15857655 Change-Id: I285bb38ab9bbd9648e4b8a161ff6dcf1ba8d58cb /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
a57da3c151ae174bc8621af79f3f09392ed90953	10-Jun-2014	Ray Chen <raychen@google.com>	Implement support for help library b/12068507 Primary changes: * Merge help and feedback as requested by the new guideline * Determine help context by the view mode (list or conversation) Change-Id: I6d9d7cc56063e7eedfe6db18c2c363e9b4d07cef /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
fc6fd98fc1689130529e198e77b6a2d51e6cf0bd	24-Jun-2014	Andrew Sapperstein <asapperstein@google.com>	am 9afa8222: Turn off chips A/B test. * commit '9afa8222c69559cc4e5441b69d6208d30f19384a': Turn off chips A/B test.
9afa8222c69559cc4e5441b69d6208d30f19384a	24-Jun-2014	Andrew Sapperstein <asapperstein@google.com>	Turn off chips A/B test. Change-Id: If8338b26401ba6a0d4659ef32a9c9540fc5fe7db /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
590645c7d4194909d53ce35395b1b5af7832d662	19-Jun-2014	Andy Huang <ath@google.com>	Merge "support for subclass-custom span convert behavior" into ub-gmail-ur13-dev
9ed742cd9b19ab9390c97b3c35f7af443428ccbf	18-Jun-2014	Andy Huang <ath@google.com>	support for subclass-custom span convert behavior support pluggable HtmlTree.Converter behavior. Bug: 15429227 Change-Id: I6e7f8a65f9dfe3085399300b99a6fea0f2525cfb /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
ff01727c4c069c2c395cc795ed297a544ceab13a	18-Jun-2014	Andy Huang <ath@google.com>	fix some new CalledFromWrongThreadExceptions (introduced in CL:I484d7f due to async processing of send/save text.) Change-Id: If7320b736dda094e9c9e680707615f707c6251b2 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
77b4c2c31d7601665c337ce5cbc9d84fb9332be8	20-May-2014	Jin Cao <jinyan@google.com>	Minimum html support using Html class (no ol/ul) Support basic html in ComposeActivity using Html and HtmlTree class. - Extended HtmlTree to take in any arbitrary html -> object converter so we can use it to convert html to spanned as well as plaintext. - Added custom SpannedConverter to feed into HtmlTree. - Added async task to load Utils.htmlToSpan in the background. - Moved ComposeActivity#sendOrSaveInternal to a handler thread in case Utils.spanToHtml takes a long time. Note that we only support a subset of the html tags. To see the full list of tags we currently support, refer to HtmlUtils#SpannedConverter. Performance: About 3x faster than using Html.fromHtml (yay!). Performance should not be an issue for >99% of the users. b/7406122 Change-Id: I484d7fc7d2f36c4724d9e4cb90fa1d65eadcb903 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
2ee62c0050ff141cc58f4a6801d295915e0b9b6c	19-Jun-2014	Andy Huang <ath@google.com>	am 590645c7: Merge "support for subclass-custom span convert behavior" into ub-gmail-ur13-dev * commit '590645c7d4194909d53ce35395b1b5af7832d662': support for subclass-custom span convert behavior
ff4143d93740a4919c3fd79b97d0a4c9086b6ff7	18-Jun-2014	Andy Huang <ath@google.com>	am ff01727c: fix some new CalledFromWrongThreadExceptions * commit 'ff01727c4c069c2c395cc795ed297a544ceab13a': fix some new CalledFromWrongThreadExceptions
cb1018af3216a83cda4ee4a11c235da817bee537	18-Jun-2014	James Lemieux <jplemieux@google.com>	Avoid use of JB+ APIs; ensure runtime compatability with ICS Change-Id: I6ed595029a8dfb00c52f00f76964543990e3723a /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
3ecca77461c181474162acada1d956f45d6cdbb6	18-Jun-2014	Jin Cao <jinyan@google.com>	am 77b4c2c3: Minimum html support using Html class (no ol/ul) * commit '77b4c2c31d7601665c337ce5cbc9d84fb9332be8': Minimum html support using Html class (no ol/ul)
e0f032026becd0050131104539b9d8c00ce35d66	14-Jun-2014	Andy Huang <ath@google.com>	doc-centric compose New composes open new windows. Reply/ReplyAll/Forward to any particular message opens the existing compose for that message. Mailto opens any existing mailto for that URL. (debatable?) Change-Id: I40b8346455db3dc58a9d6ee86c6071f38ccbd017 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
5f08221110fad751e4d4302ec1a0c28e47d9057c	12-Jun-2014	Andy Huang <ath@google.com>	more accurate suppression of draft-save toast Unsuppress it even if a GET_CONTENT is canceled. Open up access to the suppression bit to subclasses. Bug: 15429491 Change-Id: I529ea83e62d029ba52e51169aca3f4b05404a4ea /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
7e04f140525a8949533b28b7477175b491a17a0b	11-Jun-2014	Andrew Sapperstein <asapperstein@google.com>	Revert "Use "Re: (no subject)" when replying to an email with no subject" This reverts commit a954f9914a8fc6c65587db4f1d4660d60319d909. Fixes b/15189487 but re-opens b/11810597. Change-Id: I470cd1a0dba811a7cb6d35d6d601c6af4810f603 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
e806c9447c7137d2a7a828e7ccdc1f8961aa1c2a	07-Jun-2014	Alan Lau <alanlau@google.com>	Better user experience for Gmail wear users. * Skip undo on phone when the action is perform remotely * mark conversation as read after reply. Created separate pending intent for Wear actions. NotifActionIntentService skips the Undo for remote actions. ComposeActivity adds a converstion uri to start a service to resend notification. Bug 15332337 Bug 15332837 Bug 15532541 Change-Id: I9fb51ec6ac393075b08f770bbc3b3490aab622e3 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
c782845667f1e14fed91148b2e55600082953892	12-Jun-2014	Andy Huang <ath@google.com>	am 5f082211: more accurate suppression of draft-save toast * commit '5f08221110fad751e4d4302ec1a0c28e47d9057c': more accurate suppression of draft-save toast
9dd9976b81948e302980c3f21b1eeb48915f2159	12-Jun-2014	Andrew Sapperstein <asapperstein@google.com>	am 7e04f140: Revert "Use "Re: (no subject)" when replying to an email with no subject" * commit '7e04f140525a8949533b28b7477175b491a17a0b': Revert "Use "Re: (no subject)" when replying to an email with no subject"
b479f0f1beb2203f821bc8ce07d5b62d65694349	11-Jun-2014	Alan Lau <alanlau@google.com>	am e806c944: Better user experience for Gmail wear users. * Skip undo on phone when the action is perform remotely * mark conversation as read after reply. * commit 'e806c9447c7137d2a7a828e7ccdc1f8961aa1c2a': Better user experience for Gmail wear users. * Skip undo on phone when the action is perform remotely * mark conversation as read after reply.
9ae677ee96dc0e31f08561132965b2e517cccdc6	05-Jun-2014	Alan Lau <alanlau@google.com>	am 3d51904f: Only do mandatory checks for autosend emails. * commit '3d51904f490b80fe6bab825e469560eb34150cf3': Only do mandatory checks for autosend emails.
3d51904f490b80fe6bab825e469560eb34150cf3	05-Jun-2014	Alan Lau <alanlau@google.com>	Only do mandatory checks for autosend emails. When autosend is true, only checks for accounts and recipient, and skips all other checks. This should help Wear and Now to avoid dropping send message in some cases. Bug 15315167 Change-Id: I04ff5fc5b12a0a305aed6cc406c43b88aee570b4 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
5bd3746310eeb2f23cc72d5470b5b0e93e14e83e	05-Jun-2014	Alan Lau <alanlau@google.com>	am 2fd9d0f4: Don\'t show confirmation in auto send mode. autoSend=true is only passed in from two places: AutoSendActivity and WearReplyTask, and therefore should not impact others. * commit '2fd9d0f44b80f7ce5acd8c283673bdfb10427184': Don't show confirmation in auto send mode. autoSend=true is only passed in from two places: AutoSendActivity and WearReplyTask, and therefore should not impact others.
2fd9d0f44b80f7ce5acd8c283673bdfb10427184	04-Jun-2014	Alan Lau <alanlau@google.com>	Don't show confirmation in auto send mode. autoSend=true is only passed in from two places: AutoSendActivity and WearReplyTask, and therefore should not impact others. Bug 15315167 Change-Id: Ia65d5f5047a39b5806958093bbf3534ecbf642c6 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
1b259a5e1385c6ab1505f69c65d620ddd4cf475e	04-Jun-2014	Andrew Sapperstein <asapperstein@google.com>	am 47c30c2b: Enable flag to force new chips. b/15416818 * commit '47c30c2b9313f82989779a52a119b93b5d3e7ba3': Enable flag to force new chips. b/15416818
47c30c2b9313f82989779a52a119b93b5d3e7ba3	04-Jun-2014	Andrew Sapperstein <asapperstein@google.com>	Enable flag to force new chips. b/15416818 Setting "adb -d shell setprop log.tag.NewChips DEBUG" forces showing new chips. "adb -d shell setprop log.tag.NewChips INFO" to disable. Change-Id: I4c016dd382d8d55a39370c15e766c939d915004d /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
d918be3b9317a12d6b89c3854e604f008b65577e	04-Jun-2014	Andrew Sapperstein <asapperstein@google.com>	am 1b7ad92c: Support additional checks before sending. * commit '1b7ad92c69b15d084aebd1b94f3176d88b3e3c19': Support additional checks before sending.
1b7ad92c69b15d084aebd1b94f3176d88b3e3c19	28-May-2014	Andrew Sapperstein <asapperstein@google.com>	Support additional checks before sending. b/12787313 Change-Id: I5122703518f99eaf2d3324afe793a9963d2d61ff /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
1a438aab12635a857ab92c9a0d25546c4c6758a8	04-Jun-2014	Andy Huang <ath@google.com>	resolved conflicts for merge of 5315954c to ub-mail-master Change-Id: Ic27dac533aab050497d111234aaac016796b47a5
91ede36047ebe20cb2f4783c71454d1791abc95c	22-Jan-2014	Andy Huang <ath@google.com>	support for subclass custom attachment handling Aslo add some support for open-ended body pre- and post-processing. Bug: 12787313 Change-Id: Ie2aeb9f5cf1e10f9e21a3bd1cc2e1db489319b7f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
927f2705dec69f250ca6e6b4da57641e03341f31	30-May-2014	Andrew Sapperstein <asapperstein@google.com>	am 8f9eac82: Merge "Start auto-suggest on first key press. b/15330380." into ub-gmail-ur13-dev * commit '8f9eac8293dfcd6a325b6d6599b756e3e5c35b11': Start auto-suggest on first key press. b/15330380.
09da942e799d93be2f65a0808a4cf36fce8b6bc6	30-May-2014	Andrew Sapperstein <asapperstein@google.com>	Start auto-suggest on first key press. b/15330380. Previous threshold was 2. Now it's one. Change-Id: I2d94c1e230035bebda88bd6a4eb782cac0e9d3f6 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
a7b23dab1adfaf166c5eb8136b3d137c3db77f06	28-May-2014	Alan Lau <alanlau@google.com>	resolved conflicts for merge of 439aa5d7 to ub-mail-master Change-Id: I8bca2214d72249b9c289763ba5b304b208521fb1
439aa5d7d9226de4682c3697c68c0703b8847518	28-May-2014	Alan Lau <alanlau@google.com>	Port Gmail to new wearable api. Change-Id: I6ec0e72945814d11be8396f5984bc627b75378e7 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
c4288f2504ddf203bf558c7ae0143f36f842535b	16-May-2014	Alan Lau <alanlau@google.com>	Wearable notification api change. Bug 14685201 Change-Id: I24ac8086f685bf6b3dcd1847f755590b8fdc9dfa (cherry picked from commit 575255c9ad5bcb708f60e928bdafe32301dcf667) /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
03728036eefafaac9d05bb917fff3781eb52ebe4	19-May-2014	Andrew Sapperstein <asapperstein@google.com>	am dc7c68e6: Merge "Randomize using old or new chips for A/B testing." into ub-gmail-ur13-dev * commit 'dc7c68e6376c3b8ddeacc6e00545f60fe8e2d309': Randomize using old or new chips for A/B testing.
50453e41f9cd7b3ea49844c8f0ee5ca43cc85b67	16-May-2014	Andrew Sapperstein <asapperstein@google.com>	Randomize using old or new chips for A/B testing. b/11387812 Change-Id: I6abec1a92243153e2dba6a95f91f91ce1d8fef8e /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
575255c9ad5bcb708f60e928bdafe32301dcf667	16-May-2014	Alan Lau <alanlau@google.com>	Wearable notification api change. Bug 14685201 Change-Id: I24ac8086f685bf6b3dcd1847f755590b8fdc9dfa /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
25bc7a09311cc43d160192a3c141b0f4b96eeee4	15-May-2014	Andrew Sapperstein <asapperstein@google.com>	am 27525c88: Merge commit \'ffd61557\' into merge * commit '27525c88c5de42209691ce5037edb8a659ffba02': Add autocomplete suggestion analytics.
27525c88c5de42209691ce5037edb8a659ffba02	15-May-2014	Andrew Sapperstein <asapperstein@google.com>	Merge commit 'ffd61557' into merge Conflicts: src/com/android/mail/compose/ComposeActivity.java Change-Id: I1444c549dffeecaa4602348e36f7972b59df9eba
2f5d89d56333e88a5bcd9454d79cb74fccc7615c	15-May-2014	Andrew Sapperstein <asapperstein@google.com>	am 828fc592: Merge "Support for extensions to chips. b/11387812." into ub-gmail-ur13-dev * commit '828fc5922d103b70e87c602af31072ce2fd4817f': Support for extensions to chips. b/11387812.
ffd61557c972293bbfacb5568af9215dd832544f	15-May-2014	Andrew Sapperstein <asapperstein@google.com>	Add autocomplete suggestion analytics. Change-Id: Ib116e1a66ee50a59fd589eefdae0bb7d67fb7294 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
f5ab8ac74055546cca77c4771502294e217e452b	03-May-2014	Andrew Sapperstein <asapperstein@google.com>	Support for extensions to chips. b/11387812. Change-Id: I6d728d5e2cbdb2583b3aefe5b315f38999d2158f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
1877c5f26fccccef2e4a7206b962a9b6118077b2	13-May-2014	Tony Mantler <nicoya@google.com>	Check for null/invalid attachment Uris in compose intents b/14834660 Change-Id: I89165173a5a6a73b17e424ff39b8ab61dbe44549 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
7692a75a0177a4bf7156cd8fa3147e1427ee8bf8	08-May-2014	Jin Cao <jinyan@google.com>	Merge "Make SendSaveTaskHandler static singleton" into ub-mail-master
32973b4a81b129650877ec680514404078934288	07-May-2014	Jin Cao <jinyan@google.com>	Properly update cc/bcc visibility in finishSetup Update cc/bcc view visibility in finishSetup and remove all other unnecessary visibility updates as finishSetup is always called. b/11272953 Change-Id: I5e5166d2bdfe7cf2145042d570eea11868598674 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
5134be5675910391d1bd3af337cdecf0327bed0f	07-May-2014	Jin Cao <jinyan@google.com>	Make SendSaveTaskHandler static singleton Make sure we only have one instance of SendSaveTaskHandler per app so we both ensure serialized uploads (no race conditions) and no leftover threads hanging around. b/14090635 Change-Id: Iacb30154486468d4cb6c9be28e27e6bc8b3fff67 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
2a3cc13b4473136c6ebfb0a257f81c66c2d3e8b3	22-Apr-2014	Anthony Lee <anthonylee@google.com>	b/14075613. Don't use indices created from html on text/plain strings. The problem resulted in a StringIndexOutOfBounds exception when composing a reply from a plain/text only email. The tricky part is the the text entered in the response needs to be short too. The index of the point where the quoted text starts is built off of an html formatted buffer but applied to a text/plain buffer in the response. This problem was not one that was seen in the Gmail app since all mails contain html parts but the Email app is not so lucky. Change-Id: I666c21d9066f5a2f4dc7131fa151e34ff6193ee2 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
34ff28036c77863092d35d4cca9e8faad2db7862	16-Apr-2014	Scott Kennedy <skennedy@google.com>	Remove an unused method Change-Id: Idbd448be27f600ccd5a1c05520315b6f6f6187ea /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
c96efcc4a2f65b11a9b2057320ca828ee80f32ff	10-Apr-2014	Andy Huang <ath@google.com>	DO NOT MERGE "waiting for sync" -> "getting your messages" Bug: 12421412 Change-Id: I5ee3d66add25ebc75420c3433f47cb44b85e3275 (cherry picked from commit 5d674a741d78f7771299c426a4bfe0d319cc0f2b) /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
a0287a8b7abd74cca66f9f364efa0d22e8d5c1d7	07-Apr-2014	Scott Kennedy <skennedy@google.com>	Don't assume ComposeActivity's class name won't change Instead, use a generic intent action that will just launch whichever ComposeActivity the current app needs. Change-Id: I3ebfa8d5669bce99ba326d6f43c8c4d735987680 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
7476dee25e80cb9650b047925344a95a2ece96a7	31-Mar-2014	Jin Cao <jinyan@google.com>	Merge "Fixed bug with % encoding" into ub-mail-master
d67d7e392e895bf7ea0452d020f57bd04c43fd63	27-Mar-2014	Jin Cao <jinyan@google.com>	Fixed bug with % encoding The app crashes when %25 exists in the body of mailto (actually also crashes if it's in the subject). This is caused by attempting to decode % encoding twice through getQueryParameters and URLDecoder.decode. e.g. body=Bye%25Bye, after getQueryParameters. the string turns into Bye%Bye, then passing that into URLDecoder.decode will throw error because %Bye is not a valid % encoding. To fix, we manually re-encode %, then run it through URLDecoder to get the correct message. Added unit tests to test full functionality of initFromMailTo with various inputs to make sure that they are displayed correctly. Tested original bug on phone, and % sign is rendered correctly with no crashes. b/12441256 Change-Id: I06b2a4378f11de58d59b4978db1af751928570c7 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
15490239c82cdb4765e87e926c8c1945adedd1ed	06-Mar-2014	Alan Lau <alanlau@google.com>	Gmail changes to support Android Wear * Replace reply/reply all action with Android Wear action. * ComposeActivity handles the reply intent and sends email in the background using AsyncTask. * Create notification bundle for all message so that user can apply action to each of the message inside the bundle. Bug 13405604 Bug 13629669 Change-Id: Ia7efa28c7f333b9571d7e99e83cba6124f843e50 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
f8c59b0198bd3230ef669c5e258b86443e7ed682	20-Mar-2014	Andy Huang <ath@google.com>	add analytics for clicks on drawer footer items Also start segmenting menu_item clicks with useful data about the click's context (like view mode, compose). Bug: 11061485 Change-Id: I132117921bb45f81d2cd7d8433ab72543c9723fd /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
10fcd645f703799326da326630b663df69f91508	03-Mar-2014	James Lemieux <jplemieux@google.com>	Move Help & feedback to Nav drawer of Email. b/11061485 Gmail remains unchanged due to this checkin. HELP and SEND FEEDBACK are now the two bottom-most drawer items in the Navigation drawer of the Email application when it is present or in the overflow menu when it is not present. SEND FEEDBACK still behaves as always. HELP has been redesigned so that it displays the help content in a local webview rather than using an external browser in the Email application. Change-Id: If1bdba26ac2caca79c81205a409c67659cd49653 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
a01ddca3d199c3081d0c4168f15caa30735adb71	04-Mar-2014	Andrew Sapperstein <asapperstein@google.com>	RTL: properly align from addresses. b/13082177 b/12687526 Change-Id: I88789a9b986fe0889de2b23c7e8acad5d4f0b0cf /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
26a20758413f0f8629ea71a0943304e3ae740165	01-Mar-2014	Tony Mantler <nicoya@google.com>	Get rid of Account#name b/13249115 Change-Id: I5478b139cba9e3e37924c3af1c7a4f818a803fa3 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
6a7ac7891eac4246b266cf8533432f96a97f37e9	20-Feb-2014	Tony Mantler <nicoya@google.com>	Fix compose message cursor placement Place the cursor in front of the signature when it's appended, regardless of whether the text area is focused. The signature gets (re)-appended in two cases: 1: When we initially set up the compose activity and 2: When we change accounts In neither of these cases do we generally expect the body text area to be focused, so the code to set the cursor ahead of the signature was basically never being run. This meant that when you tabbed into the body text area (hit "Next" on the IME or whatever) the cursor would be placed at the end of the text after the signature rather than, as intended, before the signature. Thus I separated out refocusing the body text area from the cursor positioning, and ran the cursor positioning code unconditionally when the signature changes. b/11355420 Change-Id: I3c29ffb9734ea145eb5c6fcdc202c65669e8e2b3 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
581edd40a2173e9e656f45e78c1f5de48aae1718	19-Feb-2014	Tony Mantler <nicoya@google.com>	Warnings and finals Change-Id: I1f6b3b2170a430dfb32bc8b74b4265257edb0571 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
865ae9ca2606d901ce33259bae5cfe71beaa18ba	11-Feb-2014	Andrew Sapperstein <asapperstein@google.com>	Hide inline attachments in compose. b/12553195. Just hides the attachments visually. They still exist and are counted against the max attachments size. Change-Id: Ia8c026fa083c3a95b7bc22b1564349d455f0030a /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
890afa256f9c30003b9690135922903354b51a67	23-Jan-2014	Andrew Sapperstein <asapperstein@google.com>	RTL - properly align from address in compose. b/12687526. Change-Id: I5f09303674da08b7870a84ef6477d7bfac4015cd /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
ca4676fc807c3a42b44cab638b2077e0327cc7e3	16-Jan-2014	Andy Huang <ath@google.com>	fix more name/address confusion. fixes blank From spinner. Bug: 12586139 Change-Id: Ie5c52507653bde9621e3f3eac5281bd3642a5b5d /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
e2af887b5398d2445498a0639687fe4183e26f5a	16-Jan-2014	Andy Huang <ath@google.com>	fix AIOOBE when no reply-to present Bug: 12535448 Change-Id: Ie8ae3dedfb9f06d48a0dcb59798cf3f703892b14 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
24f116f285d6f58b01421d7cd0d3daecc643cf6b	16-Jan-2014	Tony Mantler <nicoya@google.com>	Enable multiple reply-to addresses This works in Email, but Gmail seems to strip extra reply-to addresses before we get to the reply process. b/12535448 Change-Id: If679d7735df70d7072f3f27f811a2da8dfd46786 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
821e578a71c7015646522e729600618f0ec16fc0	07-Jan-2014	Tony Mantler <nicoya@google.com>	Deduplicate Address class Change-Id: I4f6df51f5641475ffaf96b0189ccc00748880cc0 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
e1a5ab76612bafad5c80c04be77d87066ac585a0	03-Jan-2014	Tony Mantler <nicoya@google.com>	Merge "Regularize usage of ReplyFromAccount#name" into ub-mail-master
65ba82f6721404888f0866122c8ab39a26716085	21-Dec-2013	Andy Huang <ath@google.com>	am 0a2a346c: fix internal fancy mailtos * commit '0a2a346c8f40ad256eef840338a75a3bdfbe8251': fix internal fancy mailtos
0a2a346c8f40ad256eef840338a75a3bdfbe8251	21-Dec-2013	Andy Huang <ath@google.com>	fix internal fancy mailtos Mailto: links that included anything other than a "to" address weren't handled correctly when a user clicked on one from within a message body. Pass the entire 'mailto' URL to ComposeActivity to ensure our normal mailto parsing code kicks in. Bug: 12137171 Change-Id: I0352ecc80b7c9cfadeb605f8e0b2a694387c9b03 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
a954f9914a8fc6c65587db4f1d4660d60319d909	03-Dec-2013	Tony Mantler <nicoya@google.com>	Use "Re: (no subject)" when replying to an email with no subject b/11810597 Change-Id: I5e608cb1109c88b12189d2d19b7fe787c498acf8 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
f441d149b334648917c551137a6b4fffdeb83b84	22-Oct-2013	Tony Mantler <nicoya@google.com>	Regularize usage of ReplyFromAccount#name b/11334332 b/11292541 Change-Id: I0394ea2caf86bbf200a3027f288aa078d965503c /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
6af4058e11f1a6f690490fdc51c32920133f3f77	01-Nov-2013	Tony Mantler <nicoya@google.com>	am ec275afa: Merge "Don\'t request the menu to be shown if there\'s no items." into jb-ub-mail-ur10 * commit 'ec275afa50ffc138a56005a95f595b99fd28bcc6': Don't request the menu to be shown if there's no items.
5b8799a200e53e1eb66963e716b911b35bffecaf	31-Oct-2013	Tony Mantler <nicoya@google.com>	Don't request the menu to be shown if there's no items. b/11361756 Change-Id: Ieb4fe9ca83b2edfe467a65c1d1e604348bdfb82f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
530ac7a22c1607648182ae94950e1dcc3f458399	30-Oct-2013	Andrew Sapperstein <asapperstein@google.com>	Update send confirmation dialogs. Fix b/11043153. Change-Id: Ia500097515b0c29de1adf02ffb699ce4569b331f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
4fb8c5530674643f8956878b7a90a6b6c9420dd5	25-Oct-2013	Tony Mantler <nicoya@google.com>	am c19bbbca: Merge "Divert mailto Uris directly to compose activity" into jb-ub-mail-ur10 * commit 'c19bbbcaa6f19fc69af3791f628a8b729b34758e': Divert mailto Uris directly to compose activity
6aea786c4c8273890aa0e2d9c58d0c23907d736a	25-Oct-2013	Andrew Sapperstein <asapperstein@google.com>	New attach file icon for K devices. Fixes b/11067071. Change-Id: I41ecf8087f0f1760dc4563e02015c3e2e375a031 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
184ec73e169fa7c54e7f3c9459191dbe1702f3b4	24-Oct-2013	Tony Mantler <nicoya@google.com>	Divert mailto Uris directly to compose activity b/11329313 Change-Id: I9c255b2018b25669557b208e749e56e7fe1597b4 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
861be769a706659dd9b852717406b4f0a0810ea9	22-Oct-2013	Yu Ping Hu <yph@google.com>	resolved conflicts for merge of a2210d03 to jb-ub-mail-ur11 Change-Id: I59debf71bdde2cf1b73c914ae611249924f22043
bb036ff794f022bba2f501e155ef9c412e0e452e	18-Oct-2013	Tony Mantler <nicoya@google.com>	Populate real name in From: field b/11246653 Change-Id: I4c9ee826e0628bf04bffb98209c67318491b517e /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
8809f9f8c94814fc56666c8737881d3818f65ff3	12-Oct-2013	Andrew Sapperstein <asapperstein@google.com>	New attach UI: file-only on K, photo & file pre-K. Change-Id: I5248db59e7b9bfdb8e498b0f4695ba2c427109ae /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
949326322a27c4eef97b1b08e2b99bedc5f58ec5	11-Oct-2013	Tony Mantler <nicoya@google.com>	am fc08f9df: Merge "Clean up use of Account.name where an email address is expected" into jb-ub-mail-ur10 * commit 'fc08f9dfb8338574421ac9395dd4b71153096bfe': Clean up use of Account.name where an email address is expected
79b1156803585952a4851221dc9fa9974e606433	10-Oct-2013	Tony Mantler <nicoya@google.com>	Clean up use of Account.name where an email address is expected b/11066314 Change-Id: I65d3c92d6a50ed918a7039fba10ed4dff6a422f7 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
7d1c5c4380f532e952cb01464d4f295e1d27ca07	02-Oct-2013	Paul Westbrook <pwestbro@google.com>	Add a cancel button to the send confirmation dialog Bug: 10641724 Change-Id: I33a13404487ff456f0b968e5b5c4db2ad9a5dd9f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
5cb7180c32b279660db86012aa68e80f5bcf5bc7	02-Oct-2013	Andrew Sapperstein <asapperstein@google.com>	Allow attaching arbitrary filetypes on K. b/10819450. Change-Id: I3be5358b9b55c8ff80aba8443e30e75585b9aa61 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
05089f3bdc8ae2c70db6f77a9a6e2247e0f8ccbb	02-Oct-2013	Andrew Sapperstein <asapperstein@google.com>	Allow getting multiple attachments at once. \o/ b/11016917. Change-Id: I4a3f0c21f9ed48718dca38dd3eda5d4ed2f20300 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
746d8613b86533ceb9724edccb9815ad8af710ba	27-Aug-2013	Andrew Sapperstein <asapperstein@google.com>	Support init from extra values. Enables overriding ComposeActivities to override initExtraValues that uses the passed in ContentValues to do some extra work. Helps fix b/10393262. Change-Id: I4e1282716ce5e6f5120dece7f15e26676bd24e96 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
a49b6846c4f85c1fecc80d176ff88336e596e5fc	23-Aug-2013	Alice Yang <alice@google.com>	Fix an NPE Bug 10434691 Change-Id: I361b7452d481cbe5c7db342b7d8c106a5ed4d331 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
4fe0af81874976a1995191321e35c844b2229811	21-Aug-2013	Andy Huang <ath@google.com>	log notifications Also fix a long-standing issue that caused notification intents to never get updated during development (we weren't setting FLAG_UPDATE_CURRENT). We can remove the version tag from the intent data URI later. Log reply/reply-all setting. Bug: 9861033 Change-Id: I49b2ab529de4167d1c8b42a8b053bcc2b9f65a23 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
8cc0de897f4d4b5790a363684347eeae06088f45	20-Aug-2013	Andy Huang <ath@google.com>	disable analytics for automated users Also fix logging send/save on Compose exit before the loader finishes. Bug: 10404880 Change-Id: I6a8937a4b25b6150cb27d335f6b09a8fd372aaf3 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
44d4481f7cf9adf48820bd2c63cb35f98f9b12fd	19-Aug-2013	Scott Kennedy <skennedy@google.com>	Save ad event id on rotation of ComposeActivity Bug: 10393502 Change-Id: I7bb31041d4f360990bebbecc35659fc5646e282b /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
e003b4cc4a23e6d394998bebe26430a361c5ac29	16-Aug-2013	Andy Huang <ath@google.com>	metrics for attachments Improve folder-switch logging with detailed data for system folders. Also prevent exits from a blank compose from triggering a log event. Bug: 9861033 Change-Id: Ie75323fe3704d3010acd864c6d7c646ebd7708b5 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
59e69095bd558a1e6ae890ce79b7b848331d0cc6	14-Aug-2013	Tony Mantler <nicoya@google.com>	Reimplement QuickResponse support b/8622751 Change-Id: Ia0a7f12b2a8dfe0c36d388d13c95745e46354b24 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
dc97bf4509c450c9121b79ec4668e0f9b34f0690	16-Aug-2013	Andy Huang <ath@google.com>	compose/attachment metrics Log attachment count on send/save (and not discard), and only on activity termination (to avoid multiple hits per compose). Bug: 9861033 Change-Id: Icbe574aa45fe4f7804c52d46f4efc91be0437f7f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
60847256c691b2677772a46919038f9c600fecf7	16-Aug-2013	Scott Kennedy <skennedy@google.com>	Attach the ad event id to forwarded messages Bug: 10212376 Change-Id: Idd79376bf349d350e49f6487228c25699805a8c6 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
f0ea4849bf7a2c11f99ca0b42307ae8ba665b1dc	14-Aug-2013	Paul Westbrook <pwestbro@google.com>	Add public no-args constructors for fragments Bug: 10311630 Change-Id: Ic7ba4783be34a9c3d185f6cbad3001f49b310aad /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
b02ec1db0a41b4a3e8cb47f7393c96e7fbed1e6f	13-Aug-2013	Tony Mantler <nicoya@google.com>	Merge "Remove code that made no sense and did nothing useful" into jb-ub-mail-ur10
1e05a1eedd720aac611c6402c3655ec92c23a43b	13-Aug-2013	Tony Mantler <nicoya@google.com>	Remove code that made no sense and did nothing useful Change-Id: I2cd81a8dc3fc977e2ea41ad96b5346ff7a9402d2 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
761522c1ac7a8fa05acde714f0e26fde47f3415f	08-Aug-2013	Andy Huang <ath@google.com>	basic analytics support Bug: 9861033 Change-Id: I940e25dc12a7cbfe91b1d5ec457c7fc1045171df /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
e3fafee7315d77da9bdf00bb4ef7ee21b9850c8f	09-Aug-2013	Andrew Sapperstein <asapperstein@google.com>	Merge "Support compose with quoted html." into jb-ub-mail-ur10
9f32423b2e1f7ef6747eb1a27f3faa15f5a3db1c	08-Aug-2013	Tony Mantler <nicoya@google.com>	Remove live/unused code from UIProvider contract class Change-Id: Idc5a2c2e768b6777077329c7629ab26abb2dfcbb /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
bc5e0dcf723918eb986d733ef42d64bcf2ec4ed5	08-Aug-2013	Andrew Sapperstein <asapperstein@google.com>	Support compose with quoted html. ComposeActivity now can be started with EXTRA_QUOTED_TEXT or EXTRA_HTML_TEXT which will place text into the quoted region automatically. Goes towards fixing b/6373710 but using EXTRA_HTML_TEXT has not yet been tested. Change-Id: I795a0141603670891ccc09a65b2432c0f8db95c8 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
d90639004a3551d7fb7086f318d4c576d54d2b86	03-Aug-2013	Scott Kennedy <skennedy@google.com>	More warning cleanup Change-Id: I22970341bf11eb355aa495f61c022efb8db61bcb /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
aa27bc0e1c3bb6be4609b00007637a9d3e960f5e	02-Aug-2013	Scott Kennedy <skennedy@google.com>	Fix more warnings Change-Id: I78c6df845aae3475c1e2469b29b52cc995d8d3ae /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
2b9d80eb16156173f11a02eae4f770d8c975927c	31-Jul-2013	Scott Kennedy <skennedy@google.com>	Change all resid switches to if-elseif-else I really want to get this building in an IDE. As per http://tools.android.com/tips/non-constant-fields, library projects (like UnifiedEmail will be) have non-final R constants. They are not final until packaged into the main application project's (Gmail/Email)'s R.java. As such, they cannot be used in switch case statements, and we must use if-elseif-elseif-elseif-...-else instead. "This is typically in UI code and the performance impact is negligible." Change-Id: Ie699c13e1becd51c59c1b2ea81bc902d4f2e28d9 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
2b215b7e4aa5901322dd6ef2e4e8616a4552e9b3	31-Jul-2013	Tony Mantler <nicoya@google.com>	Re-add cancel button to discard dialog b/10097739 Change-Id: I74246e2559e781eadce311205656d29033cb73a6 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
89de9eb1933bb2df287b74a93f6de5b1d19895ae	25-Jul-2013	Tony Mantler <nicoya@google.com>	Fix more usages of escaped email addresses b/8129548 Change-Id: Ic2499dd8989797b49b026765ac634e8cc0e31a85 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
176a1993ab15298de58f0cc988939b2cc1632689	22-Jul-2013	Paul Westbrook <pwestbro@google.com>	Fix NPE when running on master Bug: 9966123 Change-Id: I1e0e2642cd5e6fa6f83622e498781c40a9b9f441 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
9016a5e827ae7baff9199811ecc8a9de9690b838	19-Jul-2013	Tony Mantler <nicoya@google.com>	Handle html encoding in email addresses b/8129548 Change-Id: Ia11cc1d0d042649f896f8405990e660d23749455 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
6d2442ba4417717b2a19714b0ac28c7265872ba3	18-Jul-2013	Paul Westbrook <pwestbro@google.com>	Add some tests for replying to a message The new tests excercise: 1) Replying to a message and ensuring the the "fromAccount" is the same as is specified in the original message 2) Handling a "mailto:" url and ensuring that if the account is specified in the intent, the "fromAccount" is set to that account Change the MockProvider so all accounts are correctly populated Change test methods to use runTestOnUiThread instead of Activity#runOnUiThread, as asserts stop the test suite The new test methods setup the activity in a way that the user does. The original test cases should be updated accordingly Bug: 9823857 Change-Id: I8598fd1b27c57cf8bcd371be8960267a5ac1a770 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
3de76eca03ed7ec1d40f2cce23cbbbe8e5e6d70f	16-Jul-2013	Andrew Sapperstein <asapperstein@google.com>	Conversation View UI Refresh: links w/o underline. Using a custom span that disables underlining of email addresses. Additionally, uses a custom onClick that opens ComposeActivity with the currently selected account. Still uses autolink, and just replaces the URLSpans with a custom replacement. Change-Id: I30f98e124dddc4b732c7e188102928a88dbf222f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
c97ec3e157f1b2a30ebdc96ba9c6007f2f719aa6	13-Jul-2013	Paul Westbrook <pwestbro@google.com>	Fix replying from "combined account" A bug to tracking the addition of the unit test has been filed in bug 9823857 Bug: 9595801 Change-Id: Ie5eb8b5ea4cfddf9c111144c7b5b8ad2844e31b3 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
2558b509117872e539a6eaeb72aa63425529d50b	09-Jul-2013	Tony Mantler <nicoya@google.com>	Stuff ComposeActivity dialogs into fragments b/9487793 Change-Id: I131d64143c625f1cbdc7edb360629b41bb45cb7e /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
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/ComposeActivity.java
fe853d3427119202562519c2add6873590851705	19-Jun-2013	Scott Kennedy <skennedy@google.com>	Initialize the adapter earlier to prevent an NPE We were setting the adapter after we set the text in the RecipientEditTextView, so depending on when the background task ran to resolve the addresses into chips, the adapter may have been null. Now, we're setting the adapter as early as possible (when we have an account), which is before we populate it. Bug: 9408464 Change-Id: I5289cb6c36b10461167231cfc456cc018316f77b /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
9f855d667e34fbf0d330845225c26956e540b819	31-May-2013	Andy Huang <ath@google.com>	don't keep a reference to view hierarchy saved state It doesn't seem to fix the 1-deep Activity leak in ComposeActivity, but at least it eliminates one reason why the previous ComposeActivity sticks around after you rotate. Since we do the unusual method of keeping the saved instance state around as a member, we can at least restrict this state to just keeping OUR state around so the view hierarchy state can be lost. Wrap all activity state in an inner Bundle to do this. Bug: 9212605 Change-Id: Id08e5347981724030af11108ad7937f79daf00b4 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
0742ee16e38baf0c7e956f279c98424a28883028	31-May-2013	Andy Huang <ath@google.com>	fix chained activity leak on compose rotation Each rotation was adding a link to the reference chain via: ComposeActivity to mSavedInstanceState to (view hierarchy state) to TextView.SavedState to SpannedString to EasyEditSpanController (a span) to Editor to InputContentType to OnEditorActionListener which is either a RecipientEditTextView, or ComposeActivity, both of which point to the old ComposeActivity. This fix breaks the Activity->Activity chain by severing mSavedInstanceState when it's no longer useful, but there is still a 1-deep leak due to TextView saving spans with references to the old Activity. Bug: 9189358 Change-Id: Ia4f6ba60fc0a0a3f4f3fd04f81832808d38d3f3c /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
7bec2b909cb5bba3bf9aae7e977fb1c8931f7230	26-Apr-2013	Yorke Lee <yorkelee@google.com>	Fix NPE in ComposeActivity if there are no accounts Bug 8632075 Change-Id: I4919d60bf7e3097b1f90de0d9c805400c9c25788 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
f7bb7a2e5a0d2c3ecd6ef13e381e1a6acc4ff0cd	25-Apr-2013	Yorke Lee <yorkelee@google.com>	Merge "Don't convert '+' into ' ' for subject title and body" into jb-ub-mail-ur9
7dd05b1b54673fe526ea35aa44e37827e8d38aa5	25-Apr-2013	Yorke Lee <yorkelee@google.com>	Don't convert '+' into ' ' for subject title and body Bug 8114150 Change-Id: I0fcf148af5a51948fe51105b8a1ffbbcf6cf8d71 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
41500399a7ee9066319c0b07055638b07312c8ac	25-Apr-2013	Scott Kennedy <skennedy@google.com>	Don't touch tokenizer-less RecipientEditTextViews Bug: 8591585 Change-Id: Icf0ecdfaee90a1055e6193656e4d0e423c0ef2a5 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
48cfe4613549cafdf36e2a524afba730522bf291	10-Apr-2013	Scott Kennedy <skennedy@google.com>	Parse Folder out of intent If we had a full Folder object as an extra, but no URI, we opened the account's default inbox, instead of the desired folder. Bug: 8526579 Change-Id: I64d1bdecea11e39fde5657910a3b3b2e22cd411a /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
ff8553f20964f4c31b0c503a9e1daff6ae08a9c7	06-Apr-2013	Scott Kennedy <skennedy@google.com>	Cleanup Change-Id: Iee8abf75639450d469632e43fe0e102b687558db /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
6214ee405453b79f08859025fee5ed361d5499fe	03-Apr-2013	Andy Huang <ath@google.com>	fragment transaction / back stack cleanup Execute all fragment-replace transactions in 1-pane immediately. This was contributing to b/8483995. Don't use the back stack in secondary activities. Not necessary. No material change to back-stack usage in 1-pane. Add debugging info to key fragments/activities. Change-Id: I1268cfbfaaca16b812b9e690facf912a1c9c4bc0 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
1ebc2db723ed29093d724eb5da906a496ee57224	15-Mar-2013	Alice Yang <alice@google.com>	Add way to report good/bad emails. Added option in overflow menu to report an email as good/bad. Currently forwards to the mailing list and prepopulate the compose text with debug info. Change-Id: Ieb468d8a13dc929dff808a3020f3d52ae7f85b07 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
a990a715012379451344246c5156d29938f12886	14-Mar-2013	Alice Yang <alice@google.com>	Load ref message for edit draft. When user replies to a message, save it as draft, open it again, and toggle the "reply" vs. "reply all" drop down, we were not populating the "to" and "cc" fields with the sender and recipients of the original email because mRefMessage was not being populated and left as null. The fix is to use an additional loader to query for the reference message that the draft was replying to. Because the refMessageId is stored in database as the server message id, and there's no existing URI for querying message by server message id, added such a URI to UIProvider. Bug 8295718 Change-Id: If6815bb272131a1ab1209ac9a595de9eb43aa2f4 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
013a23c75cf8a71c51ad1580aa84f2a8e06b6761	22-Feb-2013	Paul Westbrook <pwestbro@google.com>	Remove deprecated fields/members Change-Id: Ica1c9dbc0f190a0565c548f6566837287b19d39c /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
ac998acb2d1a5258eb43ddd24478af4ed506e9a4	20-Feb-2013	Paul Westbrook <pwestbro@google.com>	am c537fd47: Handle SecurityException when opening file descriptor * commit 'c537fd4729cb7545d09245bdaad033e676f29396': Handle SecurityException when opening file descriptor
c537fd4729cb7545d09245bdaad033e676f29396	20-Feb-2013	Paul Westbrook <pwestbro@google.com>	Handle SecurityException when opening file descriptor When saving/sending a previously saved draft, the permission for the content uri will have been revoked. In this case, catch the security exception and rely on the underlying provider to do the right thing. Bug: 8232086 Change-Id: I00db026cbaef5af8e70647f34c84e728d7bbf861 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
dae287c6b4058a27b6a069e51829f72fec903a62	08-Feb-2013	Paul Westbrook <pwestbro@google.com>	resolved conflicts for merge of 83e6b574 to jb-ub-mail-ur9 Change-Id: I949422329f8b9a1e19380b301b8fe4f529a46fe0
83e6b574cffd06164cad18ee388237a9427ceb3f	06-Feb-2013	Paul Westbrook <pwestbro@google.com>	Enable screenshots in feedback reports This will allow us to get more information about user's problems Bug: 6102742 Change-Id: I49d04d884f2d2316fe642554a2f9747807508c61 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
d5edd2d02649dffb40065fdb6a16acf91552b800	05-Dec-2012	Scott Kennedy <skennedy@google.com>	Move notifications to UnifiedEmail This involves redoing the persistence model, to split general, account, and folder settings into separate SharedPreference stores. It also requires some preferences to be moved into UnifiedEmail. Depends on I71802444add85dc01f6645906a629ff80b964222 (UnifiedGmail) Depends on Ie6ec389b5b5d2e7ab1b299d0877811ae716526e2 (Email) Change-Id: Ibe2e3f93ec164370535ffc5f5b2409544cc8d36d /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
b4931c62bffec463df9c3871d83a35bbeb9d5920	15-Jan-2013	Paul Westbrook <pwestbro@google.com>	Persist style spans in message bodies Keep all style spans in message bodies, and only remove the composing spans Bug: 7992622 Change-Id: I9e0b568ba7f1ef992fa137cdd5d60e5c22b66d4a /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
15f505ba369523b6a3b3141221db9719c5e6db80	09-Jan-2013	mindyp <mindyp@google.com>	Export compose constants so they can be reached by the Gmail compose activity. Change-Id: Ic95b15d4d537b58118a822bb7e05060c162df23f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
5ee9dc48884714e9005a1409e7002a0e04bad313	08-Jan-2013	mindyp <mindyp@google.com>	Make sure we also check for "account" to be backwards compatible Apps may supply the account they want to send mail from in the Utils.account extra Fixes b/7964518 [Send email] - Error in log when tapping edit email in answer card - Could not create an account from this input Change-Id: I6b3249a0704ece7052866eb498cfee58c23cb1cb /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
5680ec22f92125cbd95ff0f8d18d5cc04c6f0b81	07-Jan-2013	Scott Kennedy <skennedy@google.com>	Dismiss lock screen for reply notification action If no real lock is set, selecting a notification action should launch the ComposeActivity in front of the lock screen. Rather than going through a Service, we now launch ComposeActivity directly, and clear the notification from there. Bug: 7957838 Change-Id: I6344c93656106b2875bafac5bec18236d5c1d996 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
f6c00b8304062a17d14b484bd1fc33a83c4a90d7	03-Jan-2013	Vikram Aggarwal <viki@google.com>	Remove NFC handling from AbstractMailActivity 1. Remove the NFC code left behind after https://googleplex-android-review.googlesource.com/#/c/210327/ 2. Expose one fewer method from MailActivity. 3. Does not fix the activity leak, but does make leaks easier to debug. Bug: 7883592 mild activity leak Change-Id: Icde61c9b3251bf1686c50e4b5184d3d56fd2941a /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
8654d4fcc09ba68872e677b2a57877a46d27fdb5	17-Dec-2012	mindyp <mindyp@google.com>	Focus the top of the body view after the user taps response inline This is a better experience than focusing at the bottom Change-Id: I5f75448d4c8e94010da8810b9e0d51b42f25704f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
09dd373fae26156a847bb99d88474a7538b9e7c1	17-Dec-2012	mindyp <mindyp@google.com>	Focus the body field after the user taps "respond inline" Fixes b/7742802 Jank observed when trying to respond inline for message in gmail Change-Id: I3b1e7b70a733058b5a36cf057a8d8d5e7dd22c4e /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
816b3f0adc04db073820f04ce379e5126e1cbef1	11-Dec-2012	mindyp <mindyp@google.com>	Fix crash when the ui isnt setup yet Fixes b/7712572 bugreport key sequence is hitting an NPE in compose activity Change-Id: I9e0da7ee5dd80efa8e8c11476d62da39efe0adcf /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
68c0bfcc4c5ee390305b6f677dc43ad0036371d8	04-Dec-2012	mindyp <mindyp@google.com>	Make sure we follow the ref message if it exists. Fixes b/7667921 losing recipients when switching from reply to reply all Change-Id: Iaf74132571959fdbeffc7d3b6bad627fce98ac6d /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
0aeaf7d8c2ee4bc882ca901531f985c61b4cc7c7	15-Nov-2012	Scott Kennedy <skennedy@google.com>	Minor changes for notification actions Includes some basic notification assets, and changes to support the necessary intents for notification actions Bug: 7481181 Change-Id: I117e717026abfc31e99f3d40c9faa53062644e56 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
1d7e9145fa4f490ba87ade0ed70ce0fa1f33be81	21-Nov-2012	mindyp <mindyp@google.com>	Update auto save/ save menu item enabled state to match ux definition. Fixes b/7549414 Gmail draft not saved when created by bug reporter Change-Id: Icd878708dc68f79076bf8d796332a0fcc2cd09b0 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
adb0e3baab697630a5d42f7bba3aa6b0c499d0c5	21-Nov-2012	mindyp <mindyp@google.com>	Merge "Make sure we store whether the user has responded inline so we restore properly on rotate" into jb-ub-mail-ur8
1623f9bfde8ced840a52820da28a0939bcaa32f9	21-Nov-2012	mindyp <mindyp@google.com>	Make sure we store whether the user has responded inline so we restore properly on rotate Fixes b/7586180 Can respond inline several times Change-Id: Id38df59f6fc6682d86f36ac033b4c7cecdc06914 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
65b06f52e5b6336493388923be88bdd2ded4e1d1	21-Nov-2012	mindyp <mindyp@google.com>	Fixup compose test cases. Add case where the user is replying to themselves or to their custom from Add correct cases for reply to Change-Id: I688cd5b7b49fe153c84fde20e73456ac574b7685 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
5ee5d69dc7ddbef52c6c62947757b3d86ac89f23	20-Nov-2012	mindyp <mindyp@google.com>	Make sure we parse out the from address and compare it to the account address Had been comparing the ENTIRE from address string Fixes b/7549198 Reply behavior Change-Id: I9cadd323418e83afa13f77930f4a678c735deae9 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
2708306e0b6f8dde22b2571d0dbcc28a53c9f29b	15-Nov-2012	mindyp <mindyp@google.com>	When to is populated, always auto focus the body. Fixes b/7543971 When composing custom message in gmail, cursor in to field (vs. message field) Also, make sure we add the signature to pre-populated messages Change-Id: I1448986df0a0d1ebb02f4ed0853d3aad1c56e6c4 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
e7b76aac2ad5b12d6b04838ca72011ceaedc8910	15-Nov-2012	mindyp <mindyp@google.com>	Make sure to use existing draft id's if they exist and populate the message as usual for other fields. Fixes b/7546324 Attachments disappear while composing mail and change orientation Change-Id: I807239187d419d3c50c20fc03059539822d4a182 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
47db6d764dd4b74ddfd7fda6412e32d84d86fc9a	14-Nov-2012	mindyp <mindyp@google.com>	Prevent getting text change events from orientation changes. Fixes b/7139683 "Save draft" option changes visibility at orientation change in GMail Change-Id: Ifc7b062328e671583e0931a240278eca4dbe0b6d /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
febd226e871263aeb21d436bee81eb2f7dec3d03	14-Nov-2012	mindyp <mindyp@google.com>	Dont expunge existing draft on UI thread Uses ContentProviderTask to do this async Fixes b/6912050 Strict mode violation when discarding a draft Change-Id: I16124b7c425da9fda98028a3ddf7935861d6740f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
c59dd8270215f97d39697dae9e69976bcfe3642b	13-Nov-2012	mindyp <mindyp@google.com>	Make sure we use our version of converting from html to plain text. Fixes b/7532730 audit UnifiedEmail and replace all Html.to / Html.from with our HTML tree parser Change-Id: Iad23b688175b20db698fce5efccbe869c12d0b5c /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
f432dbce53a73eabed150b35033f2ec1a70c9725	13-Nov-2012	mindyp <mindyp@google.com>	Do the right thing with signatures when switching account in compose Fixes b/7526729 Signature showed for test account which doesn't set for signature Change-Id: Ie0ddd6d2714baf360db285a28f4a62345ca975d8 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
d4a4866c99ae0ed8c943b6c9ced1e7fbc987c639	09-Nov-2012	mindyp <mindyp@google.com>	When starting with a draft message, the existingdraftaccount is whatever account compose what opened with. Fixes b/7503661 Message stuck in Drafts if I change From: address Change-Id: I0147c4c7498dc4305d1e785a8215dda633468f05 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
8960f0af431bc164003e09b3c8981aab808d9ec1	08-Nov-2012	Scott Kennedy <skennedy@google.com>	Maintain to/cc/bcc state on rotation The tokenized string was never updated after being initially set, even if the backing values changed. Additionally, the to/cc/bcc values were never updated once the Message was initially created. Bug: 7490394 Change-Id: Iae1c8ae88f9ab5b8e2e7fe10835587b61decf0c8 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
89576477caf3cee30caf530937531922887856a3	07-Nov-2012	mindyp <mindyp@google.com>	don't strip the sender name out of the sender address before adding the sender to recips. Part of b/7481045 recipient address briefly drawn w/o friendly name Change-Id: Ibe9a4a50337a5970f78273c99291de3dafdec878 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
34a3c56570eac4760405b3d5bff5fdc706a22fac	07-Nov-2012	mindyp <mindyp@google.com>	Make sure we focus the compose body asap when entering reply/reply all reduces jumpiness as contacts get resolved Part of b/7481045 recipient address briefly drawn w/o friendly name Change-Id: Ic63ae2238c2f348d97593b7696ac9f68145b019d /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
fe8557b7a3aca8c41d85edbc9a094d96aacb08e5	05-Nov-2012	mindyp <mindyp@google.com>	Add missed cases to custom from address logic. Fixes b/7477806 Reply-all on a conversation where you are included as a custom-from should not include you Change-Id: I8d4b5906b1f19706edad9989993e68e404a30437 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
44a6339dd80f4b5b9e5d54567021698d92467c5e	05-Nov-2012	mindyp <mindyp@google.com>	Correctly store the account used to save a previous draft. Fixes b/7423904 Changing From Address Did The Wrong Thing Change-Id: I78f39d4ab7a7e29aa1c1a030610346e9bacd1b46 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
4540ddd7ff81b59cbb690439ad48c658b5cf502a	01-Nov-2012	Paul Westbrook <pwestbro@google.com>	Merge "Don't show accounts that aren't syncing" into jb-ub-mail
faa742fcff868e17fb7e78c4c3f3ffdb01386f57	01-Nov-2012	Paul Westbrook <pwestbro@google.com>	Don't show accounts that aren't syncing Bug: 7307790 Bug: 7261612 Change-Id: I8bf1fe66a95c301aef7b9231d8c33e174bcb1d06 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
238aa47dbd4426e8bd1c958e68a9d9b70c9be0f7	31-Oct-2012	Andy Huang <ath@google.com>	fix custom reply-from when composing from scratch Previously, new messages would always use the base account email when composing from scratch. Fixing that exposed another issue where composing a new message could select a reply-from from a different account. Fix that by only looking through the current account's reply-from addresses. Bug: 7442437 Change-Id: I6e73aa89c7282e7141e15920be0de6def8f39d36 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
1f8f4dd8c53e6c18ae642235335ce492c9d1e520	26-Oct-2012	Andy Huang <ath@google.com>	fix rotate + save draft creating multiple drafts mDraft was not saved upon activity state save, so: 1) its draft ID was lost -> next Save Draft would save anew 2) its sendUri and saveUri were lost -> next Save Draft NPEs When saving mDraft, amend it with the replyAccount/mode as was previously done. Bug: 7411480 Change-Id: Ib19e3d636bae5a4cdba950f40b784b0a544ab07c /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
3c7f94d02ff557c955c5d191cef45361a10be5c9	23-Oct-2012	Paul Westbrook <pwestbro@google.com>	Open file descriptors for attachments Open file descriptors for files being shared in the scope of the Compose activity. This will allow the permission granted to be retained for use when sending/caching the message Bug: 7381557 Change-Id: I1619e6cc46bea88c0a1f537f15b1cc3ff5b83a6c /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
72e2ea860f66f496537e37ebc0ddd2c670d4c651	23-Oct-2012	Paul Westbrook <pwestbro@google.com>	Use ContentResolver#call() to send or save messages The Unified code still has support for the old mechanism for sending/saving. If the the call() method returns null, we will fall back to the the deprecated methods Bug: 7381557 Change-Id: I25cc83858f25b4d52c25d1fadd166127f4dd857e /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
dd19b63d3f560aba8962435ed5a2e1f5ae794351	19-Oct-2012	Mark Wei <markwei@google.com>	If autosend, fail fast if there are no accounts. Bug: 7353223 Change-Id: I8b397939d3cb5ccb64e776beb2355cbd30d5a2bc /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
009b3712ff1657fa839049826451321fdd938d32	19-Oct-2012	Mark Wei <markwei@google.com>	Fix 'Note to self' NPE crash. Do not allow sending messages if there are no available accounts. Bug: 7353223 Change-Id: Ic0672038bac7f169a52e20cb42d70693c77fb313 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
ed9c2f0e9b6b7d7556c3d048c78c072c21e587a1	12-Oct-2012	mindyp <mindyp@google.com>	Call toString on editable text instead of clearing composing spans Fixes b/7337059 Email & Gmail should convert Editable to string when saving Change-Id: Id1424e1f7f543ef67b96cfdaac0e7a89c3e2bb20 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
0617446db14891bffaa2748e1fc98526aac1e06d	12-Oct-2012	mindyp <mindyp@google.com>	Try to get the last viewed account if we can't get the last sent from. Fixes b/7338827 Email from mailto link being sent from the wrong gmail account Change-Id: I84eacc22bb9047faba1464a0b3e6ed33c9969e68 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
d27b6ea7fcc68b2af200158fab341c6e98727144	05-Oct-2012	mindyp <mindyp@google.com>	Make replyfromaccount protected. Change-Id: I969cb0b59e4f0d68daff2bdc7a24ef0ad69d6ffd /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
9a9e8d698ce11fb5fa8e7afecf587147f1a4e02a	03-Oct-2012	mindyp <mindyp@google.com>	Accept EXTRA_STREAM whenever it is available If the caller wants to attach multiple streams, MUST use Intent.ACTION_SEND_MULTIPLE; otherwise, will just respect a single stream Allows note to self to attach file when using auto send Fixes b/ Change-Id: Id3a0b32afe247b5fb6d4c5361e9578621d53b3f9 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
9b1ac57b10316cc1416c46f04811c54830e01529	27-Sep-2012	mindyp <mindyp@google.com>	I cannot understand why i didnt just read the field before. I fail. If there are recips in cc, show CC! Fixes b/7245209 Expanding Reply to ReplyAll within a response does not show CC, but SENDS TO HIDDEN RECIPIENTS Change-Id: Ieb846c5758d95043c2dacbb94f25886f2ba2115c /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
dfa1dec0cfdc263c51e971dc3c41b90386a24340	27-Sep-2012	Paul Westbrook <pwestbro@google.com>	Prevent spurious Waiting from being shown Now the account can represent the state that it hasn't been initialized when it can't give a definitive answer about whether a sync is required. The Compose Activity and Widget selection activity still will show the wait activity if the account is not fully initialized But the Abstract activity controller will only show the wait fragment when the account object has been initialized enough to give a definitive answer about whether sync is needed Bug: 7090741 Change-Id: I5e68f074418983b759f0e8a96fb08b65e81406e8 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
0c3c2058f75487713c64634c7f08025fd78ba012	21-Sep-2012	Vikram Aggarwal <viki@google.com>	Explicit Intent to view Inbox The Compose Activity was creating an intent with a folder object populated with uninitialized values. Using this object is very unsafe. Since the entire goal was to view the default inbox, that is easily done by passing an intent without a folder. AAC.handleIntent() shows the default folder when only an account is specified in the intent. Since using new Folder() is very unsafe, the method is made private, and a static method with a suitably dangerous name was created to ensure that callers are aware of the peril involved. Fixes Bug: 7139995 Empty conversation list Change-Id: Ic3e254630afd59a59caba10f2249e3e451005d63 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
1672ff8ed6741df5c245e55f7a4e847f6ccb8c52	21-Sep-2012	Vikram Aggarwal <viki@google.com>	Fix NPE and log incorrect state. Fix issues discovered while investigating the empty conversation list. Bug: 7139995 Empty conversation list Change-Id: I64686da10332e716ee4becf2378cc45af9865096 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
3d7048ea243df4c1ae163bd72971e83e1218e7f0	19-Sep-2012	Yorke Lee <yorkelee@google.com>	Fix drafts not saving when pressing home/switching activities Bug: 7171626 Change-Id: I8165ffed442653825f8c7cacb12502f8a712d656 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
26d4d2d9c43c499f458808f050ec73ea3c28dec4	19-Sep-2012	mindyp <mindyp@google.com>	ATTACHMENTS Also, the whole screen is now wrapped in a scroll view which decomplicates a lot of things, including putting attachments below the webview content. I should probably go ahead and show attachments for imap and pop Fixes b/7186329 Unable to view any attachments in Email (IMAP & POP) Change-Id: Ia2abb90171b5d03e2dddcbc9d4f349a3e798254c /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
8743cfca851058d50385951b111dd903b1fa6c5a	18-Sep-2012	mindyp <mindyp@google.com>	Cherrypick of Dirty fix for broken cursor position after text paste Fixes b/7110290 in jb mr1 Change-Id: I3a088f6bf889aeaddb720bd2e5359f7bf0bd98e2 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
5ed6311d6beb968e83585a43d7cdf5909e0a2cf6	18-Sep-2012	mindyp <mindyp@google.com>	We cant just split on commas because of "Last, First" <address> Use an rfc822tokenizer to get the corrected recipients this will also fix the issue where cc/bcc/to recipients are sometimes displayed as ,,,,,address in conversation view Fixes b/7173819 cc list not autocompleting correctly for gmail message Change-Id: Ia8744daafdece7ac5ad6177e969f21e436d79654 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.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/ComposeActivity.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/ComposeActivity.java
93b079ba1d38d919b557dabcd971e7aa1e3f5cbc	30-Aug-2012	mindyp <mindyp@google.com>	Update compose layout to put add photo/add video next to each other Change-Id: I85723237bc12d74848262ba5dcee62884ec6cd60 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.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/ComposeActivity.java
7ae042ef2a23bf4c87f3edfcd71f7ebc784174ab	27-Aug-2012	mindyp <mindyp@google.com>	Serialize the account just like we do for ALL THE OTHER CASES we always put account in extras in a serialized format elsewhere Do it here, too Otherwise, it comes in serialized (json) but we look for it as a parcelable but the upgrade serializes it...too confusing! Just use the same method everywhere. Fixes b/7013037 Compose new email shortcut on Gmail widget incorrectly populates from and to Change-Id: I3bb88f542fe802cdfcbbe3da1eb8207602110d44 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
62d3ec7f251f6f9a96a859a2702916d07f30a04a	24-Aug-2012	mindyp <mindyp@google.com>	Subject should only show 1 line and then scroll the content; enter goes to body Fixes b/7054260 compose subject should be 1 line; enter goes to compose Change-Id: I55bde575c584766042cabdaf5018912039ffeb27 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
cd0b0b950efebfc3964334067747b97e61c4f027	23-Aug-2012	mindyp <mindyp@google.com>	Do 2 buttons for attach on tablet; remove unused assets 1 for attach photo, 1 for attach video Change-Id: I6b4a22a47d9e746024d05e10932bc15d9624b1e6 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
17beb0b8aee78a39a2094a48ba7f55a602f701cb	20-Aug-2012	Paul Westbrook <pwestbro@google.com>	Add suport for report problem Bug: 6961632 Bug: 6946973 Change-Id: I88925b43008bff11f62f9c912422daf07ae884a9 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
30745b6e9c4d280ac578d1186fbc0cec9bd2a838	19-Aug-2012	Paul Westbrook <pwestbro@google.com>	Add context sensitive help Add support for context sensitive help Bug: 6383522 Change-Id: I409a819d3f3d5cc0b87f41f7a523dd1ad8abd980 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
1617481de7c1f9b8dfcd25ba9828e933cf9d5490	17-Aug-2012	Andy Huang <ath@google.com>	don't show new message bar for messages from self Bug: 6963798 Change-Id: I33f5a3dc54eb8f664302830a71db54e5ae8cf084 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
2db7d4a37b794e1721a5b9416068702aa799c5f8	15-Aug-2012	Mindy Pereira <mindyp@google.com>	Split attach photo/ attach video. Fixes b/6991383 Compose attachments menu Change-Id: I6bce47ede75bfac553a59f47ff7bd29025a3892a /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
1a6e938c8a97092e332707a55edb5a53996edf98	15-Aug-2012	Mindy Pereira <mindyp@google.com>	Restore draft. Was only working when doing a reply/reply all restoration fixes b/6987654 Saved draft message is not displayed when user tries to re-edit Change-Id: Ib2f7885faa6d624c334465e5fb0fa4bf9b5e3a30 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
b199d172dcb568e2c09ea60eeb109922eec2f07e	13-Aug-2012	Mindy Pereira <mindyp@google.com>	Check for active accounts in compose If there are none, then just go to "add account" screen Change-Id: I3a9a0bfa919b84cc5183a6a8f0f11c762c02867a /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
d47877e3860ea4249eddb3f6efefbc6cd39f2320	10-Aug-2012	Andy Huang <ath@google.com>	message "serverId" field is a string, not a long Also remove some unused usage of serverId. Change-Id: Ic421a77bfff6218a07d35f80219a2fae729ceb13 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
3c9115813343861a44133b805fb9f55512d20948	10-Aug-2012	Mindy Pereira <mindyp@google.com>	Format senders Strip the trailing "," when sending or saving It shouldn't be included Fixes b/6889963 compact recipients in conversation view have trailing ',' Change-Id: If7ce5771c116f67d345a05eb36705e19b3d11be9 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.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/ComposeActivity.java
ebc4bda7184ce659144eb95c7e73cb77ce3384da	07-Aug-2012	Andrew Sapperstein <asapperstein@google.com>	Improved the animations in compose activity. Change-Id: I544356733d6d742208bd1ab0a946edf83d17a464 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
78ea8e20c7d678c79153a1f814d0740f2bf3e462	04-Aug-2012	Marc Blank <mblank@google.com>	Use correct check before using expungeMessageUri Bug: 6918040 Change-Id: I75b6791e273a7a7f091db96d5b226f2607e94aef /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
cecc54a913a665af3556f3fcc11cfae4d54cb3be	31-Jul-2012	Mindy Pereira <mindyp@google.com>	Custom from updates Fixes b/6882713 Reply-all on a conversation where you are included as a custom-from should not include you Change-Id: I6f26a18db05a7624c78ef67bda251f0d5eece87c /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
c7a36999abb396ac965a981e0a3f658b537213ac	30-Jul-2012	Mindy Pereira <mindyp@google.com>	If the subject is null, it doesn't start with a prefix =) Fixes b/6900546 MR1 JOO30 - Email app crashes when replying to specific email Change-Id: I187d93ad65f95cbf5df6159a9d57b2bad88f5527 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
9b18a9a10538418f0280380e81452c52f5ce2542	26-Jul-2012	Mindy Pereira <mindyp@google.com>	Don't remove yourself during a reply all. Fixes b/6869824 Strange behavior when doing "Reply all" Change-Id: Ic285398cdabc89e5aec7fce70a9f5515686fc6c1 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
29a717e1047a2b50574e358c94a8ee8a41f377e9	26-Jul-2012	Mindy Pereira <mindyp@google.com>	Check for recipients in the cc field when doing reply all. We populate this field with overflow from "to" when there is more than one recipient. Fixes part of b/6869824 Strange behavior when doing "Reply all" Change-Id: I35ac427434628fc308bf4e34dc06df69461b859b /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
fa20c1a4e36e0da2577baddbbb38a988b2017339	23-Jul-2012	Mindy Pereira <mindyp@google.com>	Move nfc sharing logic into unified. Change-Id: I9e735480eef24dd30a12eac9a36abdcbcc7b14e0 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
47d0e65536c55d7aad8c902aef31efb41fd05cf2	23-Jul-2012	Mindy Pereira <mindyp@google.com>	Support selected_from Part of b/6239410 Composing gmail from a share intent always picks the primary account not the last used Change-Id: Ifb4715ce300ca1ae596192d97138864ba3f13a7d /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
752222d839d9afeb5c4665669eab81645e413495	19-Jul-2012	Mindy Pereira <mindyp@google.com>	Block loading network content unless the user. If the user hasn't said always show pics from this sender, block the network content for the quoted text view. Note: if the images got cached at some point, they may show up But we won't hit the network for them So a user will never see them if they enver said "show pictures" Fixes b/6302843 Replying to a message always shows inline images in the quoted message Also, fixes random orientation change crash Change-Id: Id971dde8fd3e09fba0cf0174f03ddfb8975db57e /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.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/ComposeActivity.java
8aa913bd66109f7a4252dd07d10f73132ce7beed	17-Jul-2012	Mindy Pereira <mindyp@google.com>	Updated strings/ compose fixes Update strings for manage folders(tablet)/ folder settings(phone) Remove ime suggestion underlines before sending Change-Id: I88209f3b50f95766dece384bde1ad890d7233b4e /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
1eedc7520600a315afba4fc114a9fc5bf1adacd7	17-Jul-2012	Mindy Pereira <mindyp@google.com>	Duh fixes b/6725916 Email Response Stuck in Sending Change-Id: I6bfabb7f2bfe8442668d737931face3795879a28 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
b67aa8f5975082434dc6b8ebeedf2f1333dbf86d	12-Jul-2012	Mindy Pereira <mindyp@google.com>	If there is no account, just set from to null Fixes b/6748609 java.lang.NullPointerException at com.android.mail.compose.ComposeActivity.createMessage(ComposeActivity.java:575) Change-Id: I10ba9c62f391e340a97abd17c222bbbb8d096620 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
96a7f7aa2de33b1722009a9ee77d2b7b18a8e3e9	10-Jul-2012	Mindy Pereira <mindyp@google.com>	In reference to message fixes b/6292922 "Reply by gmail / Forward" options in Gtalk search doesn't populate the data for To:, From:, subject & quoted text Change-Id: If453783f56ebffad02630ba8d949ed1bbbf43532 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
b18e5a9341c73541d7201830c513cb0ed247e935	10-Jul-2012	Mindy Pereira <mindyp@google.com>	Send a uri for extra_in_reference_to_message_uri To maintain backwards compatibility with gtalk. Change-Id: Ieb5853c1166827f1f770eece1a96059959b4bc83 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
5ad02918f663bc52522a2505de985df9ef5ea347	09-Jul-2012	Mindy Pereira <mindyp@google.com>	Handle json in widget launches. We don't need a separate string and parcelable, since we just send the folder as json always now. Change-Id: I77456116ad0f9bfae4652d043c52ed9828ea86af /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
a214833a75ba2b27cdd166ceee9a2529b13a17c4	02-Jul-2012	Mindy Pereira <mindyp@google.com>	Stop saving extra drafts! We only need to call saveifneeded if the activity is exiting to perform the auto-save of a draft when pressing back/up Also, whether or not things have changed, if the draft is totally blank, don't save it Fixes b/6516255 Empty message is saved as Draft when file is too large to attach Change-Id: Id746beb1e2543bd4ba63295f88e447407074f626 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
d90f7ac9b1a62e8beefdac3ceda9e4cb75ef000c	27-Jun-2012	Mindy Pereira <mindyp@google.com>	Fix monkey crash Fixes b/6748609 java.lang.NullPointerException at com.android.mail.compose.ComposeActivity.createMessage(ComposeActivity.java:575) Change-Id: I848672b521f2fd67f8bf59b5f74089771f562fd4 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.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/ComposeActivity.java
cbfb75a0f92a3ef5cf10ab94b451e4898cc78bfc	25-Jun-2012	Mindy Pereira <mindyp@google.com>	Remove listeners for text attachment changes when we are changing modes. Mode changes don't count as user changes, so they should not enable the "save" button or cause a save on exit without other changes. Change-Id: I30542bb90b7607044d6841415301b6dd29238f12 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
e5f20bf1c293497625b0f2865302e6712a854959	25-Jun-2012	Mindy Pereira <mindyp@google.com>	Check for validator. Fixes b/6716299 java.lang.NullPointerException at com.android.mail.compose.ComposeActivity.checkInvalidEmails(ComposeActivity.java:1686) monkey crash Change-Id: I4a508df5f74ebfa3a0f4b3e5d74bbc22441968dd /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.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/ComposeActivity.java
bddd6f39f34aa15fed2e757f7d3e4163272ca02c	20-Jun-2012	Mindy Pereira <mindyp@google.com>	More test cases for switching modes; now with attachments. This stuff is tricky, so adding lots of tests. Change-Id: I423cb91134bd084cf033c33a1e3595018f74f8fe /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
b3112a2bf7b805695259e412b0e2bc0e0e73e9d6	20-Jun-2012	Mindy Pereira <mindyp@google.com>	More test cases for switching modes. This stuff is tricky, so adding lots of tests. Change-Id: Ib761b364d4f39c053f590ab8dbc4fa82296e3055 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
1883b346928322a9f045bc5b7426ddcd6af9beb3	20-Jun-2012	Mindy Pereira <mindyp@google.com>	Add custom from checks. Make it possible to determine if any address is a custom from for the currently active account. Now with test cases! Change-Id: Ib1a436d518cd3e4c28ac8990c95f2d337d06d53f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.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/ComposeActivity.java
1469b4e00ea101bc86adef274cf6b4705425b7fc	20-Jun-2012	Mindy Pereira <mindyp@google.com>	Handle the case when the user replies to a message they wrote In this case, it really means "re-send" to send it to the other recipients Fixes part of b/6318420 Double reply in a thread sends to myself NOTE must check for a custom from in a future thread Add "isCustomFrom" check to compose so we can do that properly Change-Id: Ic93261a7d825cf8d38410172687f29a7d15d0219 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
f7fc6c339da7f73755041cceb9b8f8447680728a	20-Jun-2012	Mindy Pereira <mindyp@google.com>	Dont read attachments from intent if there was a message we are reading attachments from. Fixes b/6363021 On orientation change deleted attachment showing in Composer We save the state of the compose activity in a message in the saved instance sate if its there dont look at what's in the intent Change-Id: Ie5f711159b79794e6ebc31b4a6041017141ea830 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
8f1c01e908d5986e8222dfd45ab82d6895b1ff3b	19-Jun-2012	Andrew Sapperstein <asapperstein@google.com>	Added dialog for picking attachment type. Currently we do not have working capture audio/video support. Dependent on some backend support as well as UX deciding it is useful. Change-Id: I97e4aded6b28a8f9a83db334064d2151ed1a2852 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
6edd597b1a6628660284f03442cce1f193af66dc	19-Jun-2012	Mindy Pereira <mindyp@google.com>	Make confirmation dialogs cancellabel via back/ tap off in compose. Fixes b/5874503 When tapping anywhere on the screen it does not bring you back to the email editor Change-Id: I4f1705816e93eb1bc72e367abb6035b8465228e5 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
ef38830943dac17adb4cade670b5ae0c6b4442c6	19-Jun-2012	Mindy Pereira <mindyp@google.com>	Fixup logic for showing cc/bcc fields. Fixes b/6676073 Replying to a message with a recipient in CC field results in black CC field in reply view Change-Id: Id07b01f90f9397e0cf4c39246ced0abef95364bb /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
e011b1d1c8e2e674dfdf1985d9d13da8cc06d803	18-Jun-2012	Mindy Pereira <mindyp@google.com>	Autosend Change-Id: I708062a62b6be8da597f34802326c0d2656cf45b /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
89bae5713b830ec1182073de22c3091d3613ac3e	18-Jun-2012	Mindy Pereira <mindyp@google.com>	Make sure we check the name AND address for an account I think at some point name was address, but now we do keep both around So check both when setting reply from address Fixes b/6684819 Reply Populates the Wrong Email Address Also, add a test case that covers this in a later cl Change-Id: Iff03622a6a33548a32fdf491bf5fe5463e21d807 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
cd970ddaba4e212b668588db2104dc46ad3ad793	31-May-2012	Mindy Pereira <mindyp@google.com>	Fixup formatting of custom from displayed addresses. Add an address field to replyfromaddress and customfromaddress. Change-Id: I01d81d5db32b6ea27286de4d5ceaaebc185708ba /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
daecb4b9b20a609b27fc803390ecf4f524b76089	31-May-2012	Paul Westbrook <pwestbro@google.com>	Cherry pick from jb-dev https://android-git.corp.google.com/g/185790 https://android-git.corp.google.com/g/185965 This makes sure the task stack is correct from the widget Change-Id: I595139a1601777e559a322fa71a8a2efc12ae2a9 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
a4069f2f16c05c6d2948baa39b0c463be4c7a360	31-May-2012	Mindy Pereira <mindyp@google.com>	Catch illegalargumentexception. This is being thrown by default by the URLdecoder.decode method when something "goes wrong" with an unencoded character. Fixes b/6580123 java.lang.IllegalArgumentException in java.net.URLDecoder Change-Id: Id45264d17b5f44071b18308e8e4e5b1009d08cd1 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
48e31b07b5ac7c83dc3a009242fa915afccddb9e	30-May-2012	Mindy Pereira <mindyp@google.com>	Clear the ime suggestions/ underline for suggestion when saving. Otherwise, we save with an underline if the user hasn't committed an autocomplete Executive decision: we use to only auto clear it if the user tapped back and we-auto saved, but if the user taps "save", they probably don't want the underline either...so I'm clearing it in response to save draft as well. I also remove the underline from text in the subject, as that would be equally annoying to save. Change-Id: If5e2a09bf0028e54cc7763463dcd5dcf75369361 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
cc8e7db940b2ad6c673e84ca7addae9295c10a33	30-May-2012	Mindy Pereira <mindyp@google.com>	Make sure we respect the quoted text offset for fwd's as well. Change-Id: Ief705a468a62d8645d23c67e59d2f972614451ce /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
d2bef8b371784d95f60dd3f89aa0ac3557c945ef	30-May-2012	Mindy Pereira <mindyp@google.com>	Fixup setting the correct draft type when editing a draft. Change-Id: Ie56161b077f3fbe4303f43a671f7b67047116b13 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
3971323f24b15b541f7460c1a4db42d78eb1873b	30-May-2012	Mindy Pereira <mindyp@google.com>	Forwards should not have the option to remove quoted text Removes the options when restoring from a draft Change-Id: I3de364110d33be7f5f7b25b1a3f67bbb7824f8b4 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
002ff5244800c32f2d70c96cc1110657020ee65c	30-May-2012	Mindy Pereira <mindyp@google.com>	make sure we properly represent quoted text in drafts. Change-Id: I86c0c09541e20d65bb3a91be9bbd229fe7c8fb1f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
71c9e569c06ee362840c14093cf1973ecf297059	17-May-2012	Mindy Pereira <mindyp@google.com>	Fixup quoted text checking on rotation. Change-Id: Id589a6444a4af487a7b47de6c30ea1a078c7696a /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
326689d531da1d2579fa7daaf6e307e24a05f993	17-May-2012	Mindy Pereira <mindyp@google.com>	Fixup cc/bcc behavior on rotation. Make sure we properly show/ hide the +cc/bcc button and change the text to +bcc when necessary Change-Id: I57c8f14c1abf204520a45cec6bb6281c80163fc9 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
d6a9a3f94c69d05f23349a09d71cd36c6fb03613	27-Apr-2012	Paul Westbrook <pwestbro@google.com>	Set clear_when_task_reset flag on get content intent Bug: 6401627 Change-Id: I6b10628ade832eb25a09e17165a8bb5a5db3fc66 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
91906814d08fe6bcfcd97f25f5a01d36d9d5dc73	25-Apr-2012	Paul Westbrook <pwestbro@google.com>	Fix NPE on save instance state Bug: 6393887 Change-Id: Id7141a459b45fceb748654b08eb5569a222bc3f1 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
36bbcaeff2a6e57189e4f4818e0ccdf6317ce836	25-Apr-2012	Mindy Pereira <mindyp@google.com>	Revert "new notif" This reverts commit c35ca0c3f57ccc4da2bcc1dd72fbb5c9467b9a3c /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
c35ca0c3f57ccc4da2bcc1dd72fbb5c9467b9a3c	13-Apr-2012	Mindy Pereira <mindyp@google.com>	new notif This shows only the collapsed version and ticker, as described here: http://android-ux.hot.corp.google.com/www/Jellybean/Gmail/Gmail_JB_Notifications.pdf?iframe=true&width=95%&height=95% The start of work for expanded is in there, but I don't currently seem to be able to show both at once or trigger the correct one, so will check in with expanded turned on and fully working in the next cl. Change-Id: I7a1de6c14d1c38e1ff205995aeedeb822b04e3fd /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
151f1ad1613ecac0207144472872440517172b5a	24-Apr-2012	Paul Westbrook <pwestbro@google.com>	Fix index out of bounds exception Bug: 6371081 Change-Id: I7f0315998b0f62a1a0c4dae8541abce6c139ec75 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
0bbc858506c95005f2840fa5dff495a9216d2665	24-Apr-2012	Marc Blank <mblank@google.com>	Finish the TODO re: deleting drafts Bug: 6369294 Change-Id: I7f9f2bec4e3281d7fbaec0c8cfa499677568cef1 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
6273e96b7204a33ea44823fb36fd7fc8baf5ba20	23-Apr-2012	Paul Westbrook <pwestbro@google.com>	Prevent ArrayIndexOutOfBoundsException Make sure to not walk off the end of the custom from list when saving instance state Bug: 6371081 Change-Id: I1c6f5c56eba342d71f9647b55576051e01642c0a /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
55271cf624269a5a19bb1989e5904df7adec7ef7	21-Apr-2012	Paul Westbrook <pwestbro@google.com>	Include the whole quoted text In forwards and replies, include the whole qouted text Bug: 6374651 Change-Id: I465ed06c3e5e2f8ab6783b0cf5ca7d7ed3a9e5a2 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
05b92b8ff275f85edae525623c71b65805ca3a51	20-Apr-2012	Paul Westbrook <pwestbro@google.com>	Fix quoted text and forwards Change-Id: Icdc9a5e1a7f1d06b52a14cef53944a5a4522fb2f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
6faeedffd7513074372ad2a4bfede496ff938e26	19-Apr-2012	Mindy Pereira <mindyp@google.com>	Correctly set visibility of cc/bcc. Fixes b/6361376 Cc, Bcc field is not visible when trying to add in landscape mode Change-Id: I9adf67a33da8652166203818e2fb30dc9b7a1257 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
9a42bb4f11c502dd5c2cf92249ac214a6c2f1a70	19-Apr-2012	Mindy Pereira <mindyp@google.com>	Provide field to set the reply from account via a string. Supply it in the intent in: private static final String EXTRA_FROM_ACCOUNT_STRING = "fromAccountString"; Change-Id: If24a6e6361667fe67aef00db5f49920ec1ae9b5b /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
4b1377e9f7677671eda0d5508a0603ec7433d19d	19-Apr-2012	Mindy Pereira <mindyp@google.com>	Put contents in correct fields. Wow. What a totally dumb mistake. fixes b/6361462 Change in device orientation copies the To address to BCC field in Compose Change-Id: Ic771275c98a8d3d135b3c86880c966ea9ea1172f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
a544d944c6640fabafeeee45042032ba58cd05b3	18-Apr-2012	Mindy Pereira <mindyp@google.com>	Cleanup setting current account position a little. Fix index out of bounds exception in compose activity. Change-Id: Id41c2eb47fde898f273b8219c87d14ed171890e3 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
8183d4519ac4b576c0af41f787267db6eff2efb1	17-Apr-2012	Vikram Aggarwal <viki@google.com>	Make the current account an index in ActionBar This fixes a few issues: 1. The currentAccount object and the accounts array are now in sync. 2. When we get an updated list of accounts, we update our current account. 3. Account checking is done based on URI rather than full object comparisons. Change-Id: Ifaae01efda0e6dfa57f009ab512aab8c3d6fa803 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
a34c9a054c9aef6f83abe56515c132a31d71b3c8	17-Apr-2012	Mindy Pereira <mindyp@google.com>	Save visibility of cc/ bcc fields; restore on rotate. Change-Id: I7307e3b294e15bbb320ebd598d3badc206cb98b5 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
e8f94dc92567d8efa691860c38720d3ae753f429	16-Apr-2012	Mindy Pereira <mindyp@google.com>	Fix a bunch orientation related issues. Restore contents of message from bundle on orientation changes We don't care about whats in the draft, since it may not be done saving yet anyway Change-Id: I51ef0324fa871b3624c16e24e60d43c92f9ef5a0 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
bb5217ee950c156d761a086bfd0d1d392d224cf4	17-Apr-2012	Mindy Pereira <mindyp@google.com>	Check for null account for monkey. Fixes b/6335995 top java crash in JRN12B: Gmail: NullPointerException at com.android.mail.compose.ComposeActivity.setAccount Change-Id: Id11a1163eb7375324bc04bee3d6524b8be63b9d1 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.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/ComposeActivity.java
3ca5bad62c075184920c5e331870280fc6acca16	16-Apr-2012	Mindy Pereira <mindyp@google.com>	Dont show sendfeedback in compose when its not supported. Same for help. Change-Id: I8ce56397b7a5b6e66b5448b171d71a9ca602d8a8 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
dbe8996d8ba382bfe1a23894abbc4711e36c9dae	13-Apr-2012	Mindy Pereira <mindyp@google.com>	Use TextUtils.split isntead of split. Fixes bad behavior where if a string between the split pattern is empty it skips over that entry. TextUtils puts an empty string there (which is what we really want) Change-Id: I9d39547351bb09b70c13cb4e984afb1c0ab3282f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
498e76d7efccc92386fe57c65a2ef8d5a0172604	13-Apr-2012	Paul Westbrook <pwestbro@google.com>	Prevent monkey NPE Bug: 6332420 Change-Id: I94d35d885bcf2c2de6ae25929aa29d9fd7bccedd /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
62de1b104635b09e7f00b0941268ba1fa5460ddb	06-Apr-2012	Mindy Pereira <mindyp@google.com>	Correct from. Change-Id: I5c4f10fbc1079c8a465fe864dd983c49f5a01139 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
3ae824c79ffba25b0cda8b0300f41a28cfbfca7f	06-Apr-2012	Paul Westbrook <pwestbro@google.com>	Don't allow monkeys to save drafts Bug: 6300751 Change-Id: Ic7a4ff4424132c2118ae3a1232bec250cddcb296 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
b1f573c59ec20f9149443e1e0cc8b64ff3a07fea	06-Apr-2012	Paul Westbrook <pwestbro@google.com>	Embed Settings into Account object Change-Id: Ie9e5d32fbd3c0dd21a43e7c6106c32641b51d467 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
92551d057965689f1952faeb06763f0762bc717f	05-Apr-2012	Mindy Pereira <mindyp@google.com>	Custom froms. DO NOT WANT. First revision. It works! And it sends mail...so that's good. Change-Id: I9e77df792d57dfc09442b711710b387b5e1e6d10 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
c6f1e2a8690bd3d4722a2e9386cdc98691135063	04-Apr-2012	Mindy Pereira <mindyp@google.com>	Make sure we put the contents of a message in the message. This was just getting reply/replyall/fwd Change-Id: I5bddf2d9fd52302b4193f566dab1f9176fd450c8 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
433b198e1a9385d1ca1284db0a168734768e0455	03-Apr-2012	Mindy Pereira <mindyp@google.com>	Focus the correct field when composing messages. Change-Id: Ic3b599d52a090db2bb5a8a0fdb1f2424adc2df7c /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
c203197908a95f707e93621e5eb5f0fb8bfc7d1f	03-Apr-2012	Mindy Pereira <mindyp@google.com>	Update logic for what to fill in when composing messages/ drafts. If the original message had bodyHtml, fill in bodyHtml. If it had bodyText, fill in bodyText. If it had both, fill in both. Change-Id: I0d82b0b15d0ea2444a5806692cb51bb42323064b /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
03ee971afd8d766dea81b72fe77593e3be3ab798	02-Apr-2012	Paul Westbrook <pwestbro@google.com>	Fix money NPE Bug: 6272613 Change-Id: I5bd47435a6c1212269976ee4c5476bc0642fbdcd /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
a83e708e162ad1f4b04b41738882bf318e217f64	30-Mar-2012	Mindy Pereira <mindyp@google.com>	Don't show the from spinner for reply/replyall/from Fixes part of b/6260630 Reply, Reply all, Forward has account selector in the From field Change-Id: I63487ab992b30ccca06cc083b9815e50553212e2 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
b13917c3d753c6674db2a226668a7f3048ddc4b5	29-Mar-2012	Mindy Pereira <mindyp@google.com>	Don't append signature > once. Fixes b/ ?? Change-Id: If696452243e454016b7856dcc76375927de17083 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
0b4f28ed53a7f1617dadf3b34de8c743a1733ce5	28-Mar-2012	Mindy Pereira <mindyp@google.com>	Dont try to get recipeints from the account compose intent. Fixes b/6247583 To field is shown with some text after a tap on Compose in widget Change-Id: I667729a1f47eededc2bc26f4738df6e38c78ca59 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
2421dc8d6d0b4c727ab7ab0e5ce730f415089e86	27-Mar-2012	Mindy Pereira <mindyp@google.com>	Read attachments from the draft conversation. Fixes b/6236948 Draft messages drop attachments. Change-Id: Ic8da50fa81de699a076a193e3097c9946113812c /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
ffe6bb0e2af5a0d4e7a51bd060829a348b121da5	27-Mar-2012	Paul Westbrook <pwestbro@google.com>	Fix replying inline And set the right quoted text offset Bug 6232824 Change-Id: I10b47cbc9d1f84e1390bc7e64280d41e82c898d7 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
61fc2f5843d33bb1678977b43d4d425063bf9c72	27-Mar-2012	Mindy Pereira <mindyp@google.com>	Don't run extra attachment parsing twice. Fixes b/6237158 Attaching an image from gallery attaches 2 copiees of the image Change-Id: Ieadd02a3e5492dfa962b7db40cd5ebe1444fcfc7 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
12575866e5526e45eaf773c6c98c93c3a06fe156	22-Mar-2012	Mindy Pereira <mindyp@google.com>	Set draft type. Change-Id: I7b07dd0a362c06a89e30b75fe6ba084158fed42f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.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/ComposeActivity.java
bb87b7fa57f25fc9cee1f572dd253f33f58f81da	21-Mar-2012	Paul Westbrook <pwestbro@google.com>	Enable editing of existing draft messages /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
1c078cff1958b29e280100bfa6221103ec46b555	21-Mar-2012	Paul Westbrook <pwestbro@google.com>	Temporarily revert this change while I fix the Email build Revert "Enable editing of existing draft messages" This reverts commit aeb7cab52bb34c94c3de4319948a8e337ed77a01 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
aeb7cab52bb34c94c3de4319948a8e337ed77a01	20-Mar-2012	Paul Westbrook <pwestbro@google.com>	Enable editing of existing draft messages Change-Id: Ib9154bffe33fda6693ef832610c81a5542eb771c /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
e8caf1279a1c6ae720215405f678172a5cbf68d7	20-Mar-2012	Mindy Pereira <mindyp@google.com>	Add quoted text fields to message. For sending messages with quoted text. Change-Id: I30ef80322cd05523e627f01e2231ce316af91e27 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
23e9fdec6872f9b4d0fbe675745cb25becf7878c	20-Mar-2012	Mindy Pereira <mindyp@google.com>	Aparna's crash? The account should never be null. Adding this to try to catch the issue. Change-Id: I21a5aa783321a8ee957001bda22557a0387c259c /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
fbe4019a262f6b1934a44e598009ae63dc5745ee	20-Mar-2012	Mindy Pereira <mindyp@google.com>	ellow onepane and two pane to specify their own behavior for conversation changes. Add menu handlers for help, settings, feedback to compose. Set up on compose to exit the activity. Change-Id: I42d2736e83cb5bedbb3194f0cffcf12aca6ced9a /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
b7050e62aab7133dea300d7fb3266311da99ec80	20-Mar-2012	Paul Westbrook <pwestbro@google.com>	Specify local message id when expunging Change-Id: I89299e2a4b4fada8019664530749375faefde2a8 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
f97588bd03fdcd318e24a9d74a283e73d1fbd37c	20-Mar-2012	Paul Westbrook <pwestbro@google.com>	Load the attachments from the intent This will allow bug reports to be sent. Change-Id: Ib8ecd56111fc6ed70bf3741e1e89fa15660b186d /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
92227f6b35b3bec54609dc0feb9dd6756c2a43e6	20-Mar-2012	Paul Westbrook <pwestbro@google.com>	Fix crash when Compose is triggered from external app Bug: 6197382 Change-Id: I3cefd195edc2442e77e3a589f2ac35c5459f4e39 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
ba5584836c0a63c8dac96b10b569465bd56d5f7a	19-Mar-2012	Paul Westbrook <pwestbro@google.com>	Close a cursor Change-Id: Ia4980c081b5f3948a9c4fb4e82da9a63157959f4 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
2eb173211741adf7454bbf1990ba1b9d1e1f6a64	07-Mar-2012	Mindy Pereira <mindyp@google.com>	Make sure we populate the single static account view. When there is only 1 account, we dont show the spinner, we show a static view. Make sure we populate it. Change-Id: If1a3bd35aff8ed87628e0d941667d9c6135d252c /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
1f93668e1186d48b507207841c1ca0529c3de292	02-Mar-2012	Mindy Pereira <mindyp@google.com>	Add missing tablet resources; get compose working correctly/ cleanly. Change-Id: I484a1880009e557fc660d56cda83313efc13825a /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
bdf7a40583381ae26d11dcd0fca40bca230f96f3	02-Mar-2012	Mindy Pereira <mindyp@google.com>	Get signature from settings for compose. Change-Id: Ie50c21e77ecf8a222b7be24910511d65b8cfea8b /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
efe3d25aa19da172fd5c3ec39539cdd91f29e927	01-Mar-2012	Mindy Pereira <mindyp@google.com>	Destructive action dialogs. Use delete/ archive settings to determine if we should show a confirmation dialog. Show confirm discard dialog in Compose and actually discard. Change-Id: I992bdf598af72a62deadfdfe695a64b89fad5c24 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
307295086b48edbb86bbd4093f4f83619057eec1	01-Mar-2012	Mindy Pereira <mindyp@google.com>	fix build Change-Id: Ibe19bb92e18c28aa974e48eba57e2ae5f9ca1d57 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
181df7851bd1eba4b6a3255073a8b731de23ae8f	01-Mar-2012	Mindy Pereira <mindyp@google.com>	Let ComposeActivity use settings. Change-Id: I9900620496476f874830a8f86c34eb317f3ffebb /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.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/ComposeActivity.java
a831b2f1ba6d3c18d5e54563df8bae1f589c4257	24-Feb-2012	Mindy Pereira <mindyp@google.com>	Use a constructor to create a provider object. Some were using from(Cursor), and it was confusing. Change-Id: I49655b4ed013fb4dd47cdefea0bfd850a3fa4517 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
679a8cc895ec75d3b578dbc77db1e9c04dd7f8b0	22-Feb-2012	Paul Westbrook <pwestbro@google.com>	Removed deprecated constructor Change-Id: Iaf2f6271d525983d7d6bd061540000c0a570051f /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
7ed1c1122c5677344a1ce176be2c03972fed26f5	18-Jan-2012	Mindy Pereira <mindyp@google.com>	Setup saving drafts. Change-Id: Id308cf902ec8ea15d2d785f21b1c821a281f8a2c /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.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/ComposeActivity.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/ComposeActivity.java
29ef1b89b158281ffb693dd5f2c5291a894109fc	13-Jan-2012	Mindy Pereira <mindyp@google.com>	Make sure we put html in body_html and text in body_text Change-Id: Ie0939b7234bf70d6ed1b117352182b997841cbf8 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
818143e2163648acc0c91f123b84777d65cd70cf	11-Jan-2012	Mindy Pereira <mindyp@google.com>	Add compose tests. First tests are for correct recipients in reply, reply all, fwd. Change-Id: I845bd3b29cee6736c7aee5a589bc548d26eb9acd /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
154386a287a9bfffb2eb3a4c05445f2774e1d4f0	11-Jan-2012	Mindy Pereira <mindyp@google.com>	Properly reset the message fields when changing reply modes. Also: * Remove unneeded import * Make sure to add to addresses to reply all (in addition to cc!) Change-Id: If2ceacd34fee4efee3cabf2fb6e25f5b433728df /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
75f66634dd18cc8d8e6f40c4573c0edf0a0343ef	11-Jan-2012	Mindy Pereira <mindyp@google.com>	Cleanup text watcher logic. Adds specific text watchers designed to look for real chagnes to the to/cc/bcc fields and not just when a chip has been matched with a contact in the user's database. Also fixes a bug in comparing selected accounts to compare the account names (duh!) instead of the name to an account object. moves visibility of quoted text call to the quoted text view as the calling app shouldn't have to know about its visibility to add text. Adding quoted text should be enough to make the view visible. Change-Id: I7fbddcd1cb69672e7a07229bf2d60bde36512220 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.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/ComposeActivity.java
5a85e2b7485a5c407c581219fe1b44417f050529	11-Jan-2012	Mindy Pereira <mindyp@google.com>	Separate logic for from address spinner into widget class. This means that the logic can be overridden by gmail/ email for selecting an account, saying if its changed, adding from addresses. This will allow Gmail to have custom from addresses and email to just show accounts. Change-Id: I389bdebe4d701f3fba9b24ad0a379d44268f56c2 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.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/ComposeActivity.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/ComposeActivity.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/ComposeActivity.java
913897e6879f5f2713b56f13022bd784cf58a585	10-Jan-2012	Mindy Pereira <mindyp@google.com>	Cleanup quoted text. Moves getting quoted text for send/ save to quotetext view. Also, adds expunge uri to the mockuiprovider. Change-Id: I6c0b7f20dc3a4459e5576388c1d86c39481209d9 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
94293687310d8fbdab4d1db91ec745d2757ac14b	10-Jan-2012	Mindy Pereira <mindyp@google.com>	Cleanup quoted text. Moves adding quoted text to the quoted text view so the ComposeActivity doesn't need to know anything about how to create appropriate quoted text. Also means that email/gmail can extend QuotedTextView and make it behave differently by changing the class in layout overlays. Change-Id: I74f210de56214f98bbf4d1655a21fe9e11e62be8 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
82cc5665cb18801022cd60cd52abcd16a50debdc	10-Jan-2012	Mindy Pereira <mindyp@google.com>	Setup send / save. Round 1: expect a few cleanup passes This doesn't handle saving request maps or respect user prefs Change-Id: Ia93400a49bdbc9052c3f9b72d3397f4e23a4d97b /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.java
33fe908589dca6a7f58aa9f56d73f74a48ac42f6	10-Jan-2012	Mindy Pereira <mindyp@google.com>	Pass the account around instead of just hte account name. We need the account for capabilities, uris, etc., so just pass it around when launching new activities/ fragments/ etc. Change-Id: If05cae10a092679ea0e7807ae36f7965d065a649 /packages/apps/UnifiedEmail/src/com/android/mail/compose/ComposeActivity.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/ComposeActivity.java