Commit Graph

216 Commits

Author SHA1 Message Date
Marc Blank
2e4b884c1d Set forwarded/replied-to flags in ref message
* Also, little bit of cleanup

Bug: 6282892
Change-Id: Ie36e6ce7eaedaed59b5b9480b8ce4eac2025c620
2012-04-10 11:11:55 -07:00
Marc Blank
157a9bd57d Set acct sync status to "initial sync needed" until inbox exists
* Notify on account when mailboxes are added

Change-Id: I8b78c37b5305a28a261a82308bb5bf88c0728fdc
2012-04-10 09:57:40 -07:00
Marc Blank
ea181b0bce Merge "Add various virtual folders" 2012-04-10 09:31:49 -07:00
Marc Blank
3a4448facc Add various virtual folders
* Added a starred folder for each account (only shows up if there
  are any starred messages)
* Added a combined starred folder in the "combined" account
* Use proper icon for the starred folders
* Set proper counts for these folders

TODO: There are probably a bunch of loose ends related to how the
counts in these virtual folders get updated

Change-Id: I72fcf543716583bdfcbdd50ffcac3b023a9b59e6
2012-04-10 09:26:09 -07:00
Paul Westbrook
b56fa92fc8 Merge "Change folder settings menu name" 2012-04-10 09:25:09 -07:00
Paul Westbrook
06fbb1354b Merge "Use plain senders view for email. Doesn't provide complex senders info." 2012-04-09 22:43:43 -07:00
Paul Westbrook
b7c5f2003f Change folder settings menu name
Use pre-JB string

Change-Id: Id829294e9f7b245ff51cc751bc834a8fa636d89b
2012-04-09 22:31:53 -07:00
Marc Blank
081582122c Merge "Add attachments to ui messages" 2012-04-09 22:21:48 -07:00
Marc Blank
39edfeb840 Add attachments to ui messages
Bug: 6309686
Change-Id: If3d25e6273c453b99aa0acfcca8e7d5636c7de3a
2012-04-09 20:07:07 -07:00
Marc Blank
9c8cc9f504 Fix total count for drafts
Bug: 6310774

Change-Id: I95db8c4751553da583ecde8b003d8d532c64a995
2012-04-09 17:06:32 -07:00
Mindy Pereira
df1440ddfa Use plain senders view for email. Doesn't provide complex senders info.
Change-Id: I4313a5e8f0f8628546011c63956dd20d5f7f0332
2012-04-09 14:42:58 -07:00
Paul Westbrook
c59b877589 Retrict widget updates to those from Email
We don't want Email to update its widget when changes happen in
Gmail

Change-Id: I2cbcb44d6a983e9824de6653746004237823b0f4
2012-04-09 10:16:31 -07:00
Marc Blank
f81cb2a7ef Handle no-accounts startup
* Properly returns result to AbstractActivityController
* Still crashes after account is created, however, since no inbox will
  exist

Change-Id: Id4da70e785d5795463aa609d571626cfcb01b85f
2012-04-08 11:01:12 -07:00
Marc Blank
46c3132c0b Remove lots o' logging
Change-Id: Iebd461a80c1dfbe11ebb86e643fef670222bff21
2012-04-06 17:43:13 -07:00
Marc Blank
2f6e7797c1 Send account uri with messages
Change-Id: Ib42578726ed42a22c0841529dd78e3976e2e7f88
2012-04-06 16:07:37 -07:00
Marc Blank
8e4b457b86 Add column for eventual thread topic
Change-Id: I23a66d3ddf2fbdce516c161017713809af458d3d
2012-04-06 15:32:46 -07:00
Paul Westbrook
05ba972408 Move settings into account
Change-Id: I0e791ead6c54af96afbfdf1d38457fb2fb41c4dc
2012-04-06 12:38:10 -07:00
Marc Blank
1f1a500eaf Set ACCOUNTS_LOADED extra with accounts cursor
Change-Id: If33f9e532aacc39caf99b58b8b955b788147d7b1
2012-04-06 12:07:25 -07:00
Marc Blank
948b008f9a Hook up settings, draft, sendmail in combined inbox
Change-Id: I91fe4799786ade66e6965056f01e2caf4adca705
2012-04-06 10:37:14 -07:00
Marc Blank
0d3f91560a Merge "Prevent empty notifications from appearing" 2012-04-05 13:55:49 -07:00
Eric Fischer
0897006e60 Merge "Import translations. DO NOT MERGE" 2012-04-05 13:08:04 -07:00
Eric Fischer
7c930b8d0a Import translations. DO NOT MERGE
Change-Id: I6eb7c2076ec915a2ae7f38344501a195197f1ae5
2012-04-05 12:52:33 -07:00
Marc Blank
27f666af7f Prevent empty notifications from appearing
Bug: 6232216
Change-Id: I079c9467fe43649f0d0d744a34fd234697e0f765
2012-04-05 12:13:16 -07:00
Marc Blank
e228be9d0d Merge "Handle "always show pictures for this sender"" 2012-04-05 11:53:47 -07:00
Marc Blank
fcc9c80af5 Close cursor
Change-Id: I6c983c921f9b27f1d69e603d96e57d285a53750a
2012-04-05 11:48:43 -07:00
Marc Blank
bdf0c30462 Handle "always show pictures for this sender"
Change-Id: Ib0bc55cd1004c5ec5415bc8d0e20f5f0f30f55b7
2012-04-05 11:21:21 -07:00
Marc Blank
385460b6f0 Set embedsExternalResources column in messages, as appropriate
* This will allow "Show pictures" to work; unclear how the
  "always show pictures" button is supposed to work

Bug: 6282773
Change-Id: I459938d98882f83a9571d2c96a825b701234e4b3
2012-04-05 10:30:27 -07:00
Marc Blank
d52710242e Set "supports settings" on EAS folders (database upgrade)
Change-Id: I19324d25846e8f12a5e4783c427291d4fc13bd3d
2012-04-04 14:20:24 -07:00
Marc Blank
3dc2a77d4f Merge "Fix bad oopsie" 2012-04-04 12:39:28 -07:00
Marc Blank
485e7cf7e6 Fix bad oopsie
Change-Id: Ia621948e8dde99bb5221a628c111f76484ccc228
2012-04-04 12:37:33 -07:00
Paul Westbrook
d4308f800a Fix build
Change-Id: I66a1e49ee5c84342e056fbdba23b0c83039812c3
2012-04-04 12:05:28 -07:00
Marc Blank
f174f00818 Set "supports settings" capability for EAS folders
Change-Id: Ifc6589c9419ad4069531998c31907d0eb7854ce5
2012-04-04 11:49:35 -07:00
Marc Blank
aad19ff4fe Use mailbox name in settings
Bug: 6282417
Change-Id: Ib763ed6fac8c047fc2b8ec1c6ffad052f2b69340
2012-04-04 11:25:07 -07:00
Marc Blank
19589ec241 Merge "Set draftType in outgoing messages and return it" 2012-04-04 10:42:54 -07:00
Marc Blank
d731127c05 Set draftType in outgoing messages and return it
Change-Id: Ie95d04b5da8125f846e40c3d703655f35d599cd1
2012-04-04 10:39:47 -07:00
Mindy Pereira
150a47e250 Send parcelable account not just the name,
Change-Id: I4abb06662301690d88bf82ab69d1e5fc1a388169
2012-04-03 18:11:35 -07:00
Marc Blank
3adeda0397 Set attachments flag when saving/updating outbox/draft message
Bug: 6282601
Change-Id: Ie9c756b59b8aa721630e38aa51001711031503c9
2012-04-03 12:36:57 -07:00
Vikram Aggarwal
87fe50ee29 Add the suggestion authority to string constants
Change-Id: I67a219d3dc3e47db42125ef58dcd42a20078ae7b
2012-04-03 10:45:48 -07:00
Vikram Aggarwal
f86a06cdad Correct authority for suggestions provider
Change-Id: Ic4fb800b54f0777f3ad4cd5417153dd5b0b0e01d
2012-04-03 09:36:37 -07:00
Mindy Pereira
78f3f29b1f Merge "Add Email shortcuts." 2012-04-02 16:31:43 -07:00
Mindy Pereira
3361003fd9 Add Email shortcuts.
Change-Id: I2cfd1a347cda0799269f21abfe6be7b9c49401c2
2012-04-02 16:04:50 -07:00
Marc Blank
f37f4e708e Merge "Support folder icons in EmailProvider" 2012-03-31 13:17:24 -07:00
Vikram Aggarwal
823a39fcef Fix suggestions package name.
Change-Id: I449ac69d4f0f38a04e1b99e7ab23e6d3095247d3
2012-03-29 15:36:26 -07:00
Vikram Aggarwal
69f44be729 Add search suggestions to Email
Change-Id: I6e25aa841af1350782f680c68d4bbe913cd88964
2012-03-29 10:45:17 -07:00
Paul Westbrook
735a837914 Merge "Connect "folder settings"" 2012-03-28 13:43:52 -07:00
Paul Westbrook
d1f8cf8710 Connect "folder settings"
Bug: 6232266
Change-Id: I65f5e07c14bd4c312dbaea107cdc8404e74efe61
2012-03-28 13:31:13 -07:00
Eric Fischer
7e70047833 Import translations. DO NOT MERGE
Change-Id: I8008f6c6213235975c8f67c63f6dd71bfdb13b1e
2012-03-28 11:17:23 -07:00
Paul Westbrook
cd58dfcd8f No Account suport
A subsequent CL will really add this support in Email

Change-Id: Ief3d78b69418b7b44a1a002ae519a31c925e89a2
2012-03-27 23:25:49 -07:00
Eric Fischer
fae8cc96a2 Import translations. DO NOT MERGE
Change-Id: I3fb15518d09788a9906456dfd4064df9cdf5faf2
2012-03-27 11:04:11 -07:00
Mindy Pereira
dc92a417dc Merge "Fix email widget not able to be added." 2012-03-26 12:38:35 -07:00
Mindy Pereira
edae55003c Fix email widget not able to be added.
Fixes b/6227726 Can't add Email II widget to Home - App isn't installed toast is displayed

Change-Id: I87d91cd0301c57e54057b09703a2a84cb5bbf4e6
2012-03-26 12:12:37 -07:00
Eric Fischer
62f4a8d3bd Merge "Import translations. DO NOT MERGE" 2012-03-26 11:44:01 -07:00
Eric Fischer
8ea5c9fc4f Import translations. DO NOT MERGE
Change-Id: I74d1a57623b0308d157f51a4e4cc09f4be38eae9
2012-03-26 11:42:59 -07:00
Mindy Pereira
26c34f2273 Ignore updating rawFolders.
This is merely for visual changes; the folder_list update will
take care of data changes.

Change-Id: I468c3593b81369e486071272727b51c7c9dd4d6b
2012-03-26 11:07:34 -07:00
Marc Blank
35180be706 Support folder icons in EmailProvider
* Add custom layout for folder_item

Change-Id: I31697ff8fdf867f76b395217a0290931832ba8ae
2012-03-23 20:05:43 -07:00
Marc Blank
8c5527f55a Return folder list for combined inbox
Change-Id: I9f5422988d7f209e07b576f3f16ee3013f67a27c
2012-03-23 17:30:11 -07:00
Eric Fischer
17aeb1e0a8 Import translations. DO NOT MERGE
Change-Id: I0e024f4192810d011db4e95edc64b486b78c24a1
2012-03-23 11:30:40 -07:00
Marc Blank
17a0643edd Merge "Add back widget drawable" 2012-03-23 10:49:02 -07:00
Marc Blank
1fef94be18 Add back widget drawable
Change-Id: I94ebf8a652e7dd103f08fce34e605da76e56fc13
2012-03-23 10:47:36 -07:00
Marc Blank
8c0db2b350 Add widget_info back into project
Bug: 6218910

Change-Id: Ib4dd595c118a72d960fad4ae36e5701a870538d8
2012-03-23 10:27:40 -07:00
Marc Blank
a13d6d2ef0 Add email's mime type to "combined" account
Change-Id: I8f19d5db66302d6dbd4057187a2a1dd00386e539
2012-03-22 17:42:49 -07:00
Paul Westbrook
eb4abafccc Rename AccountCacheProvider -> MailAppProvider
Change-Id: Ia552eecc9597e987d49c61ba9a674da0d7e58a7c
2012-03-22 15:28:08 -07:00
Paul Westbrook
e8094d2b31 Email2 overrides Email
Make sure that if Email2 or Email2Google is installed
Email is not installed

Change-Id: Iaeb36763a0ef4ce61b822f931a203e22bd8f17a9
2012-03-22 11:11:07 -07:00
Marc Blank
b7be051020 Use draftType and refMessageId for reply/forward
* First pass (handles non-inline reply)

Change-Id: Ic2e6701940b7e21fc827c31f59eb5325b0afe0ba
2012-03-21 17:03:50 -07:00
Marc Blank
449a80d1ec Merge "Bring back debug option" 2012-03-21 12:10:26 -07:00
Marc Blank
03b7d96329 Bring back debug option
Bug: 6206168

Change-Id: Ie8bc15ae1824b3cf1fd1f85e4062cc6c80eceb72
2012-03-21 12:06:58 -07:00
Eric Fischer
8357089670 Merge "Import translations. DO NOT MERGE" 2012-03-21 11:40:59 -07:00
Eric Fischer
1d96377438 Import translations. DO NOT MERGE
Change-Id: I1c095f96d55801ff635e5b43206c8364a4d15cec
2012-03-21 11:12:35 -07:00
Marc Blank
9efec18428 Remove new message notification if mailbox is touched
Change-Id: I63faeaddf6c5aee3f7d89c2fc19dce641e7ff5e5
2012-03-21 10:56:50 -07:00
Eric Fischer
aeab37f080 Import translations. DO NOT MERGE
Change-Id: I804bbe7c9d56adcc3067d2189ff4d448ff0f5bd7
2012-03-20 10:36:16 -07:00
Paul Westbrook
81075355b2 Change the uri extras to be parselables
Add the unread count extra

Change-Id: Ie92e21949ada0c7b0515d4826750f667fcc9b34a
2012-03-19 17:34:15 -07:00
Marc Blank
3b61ac51f1 Merge "Fix UIProvider account/folder notifications in EmailProvider" 2012-03-19 14:20:05 -07:00
Marc Blank
e78327d1d2 Fix UIProvider account/folder notifications in EmailProvider
* Also, kick start Inbox sync on new POP/IMAP account

Change-Id: If0c45d66386ee82b9573b7169d2afb42ab15772f
2012-03-19 14:10:39 -07:00
Eric Fischer
95faaad50f Import translations. DO NOT MERGE
Change-Id: Ib6966874dbde7d894313f81ecaa6b1a8fce92698
2012-03-19 13:07:35 -07:00
Marc Blank
4a6c81354f Merge "Remove unused drawables and associated data/code" 2012-03-19 11:59:22 -07:00
Marc Blank
abed49efaa Use new UIProvider notification intent to trigger notifications
Change-Id: I7923ad5f33295089e22b5328479f994a9a27784a
2012-03-19 11:14:09 -07:00
Marc Blank
0ac4043d17 Remove unused drawables and associated data/code
Change-Id: I583e8e2cccf4818c989661feec59309a7859f04e
2012-03-18 12:16:25 -07:00
Marc Blank
785b41f2b1 Add support for "recent folders"
Change-Id: Ibbfc67e8b45b44c82b16008df350d1119b3acd37
2012-03-17 15:25:06 -07:00
Marc Blank
c4b807d4e9 Send auto advance and text size preference to UIProvider
* Also, use localized values for "combined" acct/folder

Change-Id: I5bb84d9332fa579c2bd03bf3f49bf868d3fb8c4b
2012-03-16 18:01:32 -07:00
Marc Blank
12b4dae362 Add confirm before delete/send and hide checkbox settings
Change-Id: I56d5f8ce690f804c69c41427bda2eb11dc4fe6cf
2012-03-16 15:46:32 -07:00
Marc Blank
057a0c27a6 Merge "Quick and dirty "Combined inbox"" 2012-03-16 12:57:29 -07:00
Marc Blank
df6e2e8708 Return folder type to UIProvider
Change-Id: I98bb6fc212f2bdcde9a563b29be5cac13ef9fa68
2012-03-16 12:24:54 -07:00
Marc Blank
fc3efa5fc0 Quick and dirty "Combined inbox"
* The Combined account appears in the spinner if there are more than
  one account
* The Account and associated Inbox Folder are generated on the fly
  by EmailProvider.
* Actions on combined inbox messages appear to work, but I expect there
  will be loose ends here and there

Change-Id: I7c5b985fa32f8311a7deabe8c4cf2c6a9672071c
2012-03-16 11:53:23 -07:00
Mindy Pereira
724fd19221 Remove unused assets; fix senders styles; fix type icon styles.
Change-Id: I7d7814080347e6b1f5b78082f367a45ccd92d776
2012-03-15 14:26:05 -07:00
Marc Blank
2c82c60e56 Change rsc file order; remove unused xml files
Change-Id: Iffea850dc83c8480e6d1a03a5a8c94587b77c579
2012-03-15 13:43:21 -07:00
Mindy Pereira
363d26a26b Remove folders from the override xml in email.
Change-Id: I0bc8984d47a69a37a6c5f014cf9afed13868504c
2012-03-15 13:11:01 -07:00
Marc Blank
d96b8f378f Merge "Copy emailcommon to email2" 2012-03-15 10:18:23 -07:00
Marc Blank
2ed66c48c6 Copy emailcommon to email2
* Also, fix Exchange logging
* Also, get notifications working
* Refactor former Email class into MailActivityEmail

Change-Id: Id726f4178134485f4a3ec1ee317861d984d659a0
2012-03-15 10:11:50 -07:00
Mindy Pereira
15add7a85f Merge "Remove calendar badge asset. Moved to unifiedemail." 2012-03-14 17:32:00 -07:00
Mindy Pereira
63f43e6457 Remove calendar badge asset. Moved to unifiedemail.
Change-Id: I9565586ee6cee36d7b2343701677e821ce0da60e
2012-03-14 17:04:49 -07:00
Mindy Pereira
c65aaacff1 Merge "Define reply state in this overlay." 2012-03-14 16:27:47 -07:00
Mindy Pereira
b6f1d718db Define reply state in this overlay.
By default, it is not included in the conversation item layout.
The drawables have been moved to unifiedemail.
Change-Id: I2c9cecb8cda32db104ced2d3273327c1096155e9
2012-03-14 16:21:55 -07:00
Marc Blank
b58523bcd0 Merge "Copy Email proguard.flags to email2; add UnifiedEmail flags" 2012-03-14 13:51:19 -07:00
Marc Blank
3378017380 Copy Email proguard.flags to email2; add UnifiedEmail flags
Change-Id: Ifdea7cc1ae2f495be3ab4fab86279962b2088d94
2012-03-14 12:10:39 -07:00
Eric Fischer
9bd07c513f Import translations. DO NOT MERGE
Change-Id: I71d5f7b5f51e227165df2fc6f3b4b09ee06b28bf
2012-03-14 11:51:23 -07:00
Marc Blank
d4882f6948 Merge email source into email2
Change-Id: I68d5290663386b00b02c7b7488ee4f5177aa504d
2012-03-13 19:10:29 -07:00
Paul Westbrook
b4c5ba963a Change Email2's build
Now Email2 is not being built as an override package, and
the package is not being renamed

Change-Id: I2f7b08165cef19c24084942f4ee11c8d401a2ca8
2012-03-12 13:39:00 -07:00
Mindy Pereira
ef337e074a Listen for the correct data update intent.
This is one of the reasons we weren't getting widget updates.

Change-Id: Ie205fb72b1d2bf646d290b6c1900c15c89ff6de6
2012-03-12 13:11:52 -07:00
Marc Blank
ddca5c8848 Add permission for attachment reading
Change-Id: I50224b5feb6772700a673bd20c27c8711d09d59f
2012-03-08 20:04:17 -08:00
Mindy Pereira
d27eed969b Connect search activities for email2.
Change-Id: I9462e2a99dc9c37b7a14b9bcc4e3b44c227c131f
2012-03-08 10:17:55 -08:00
Andy Huang
cbebb35426 fix double-spinners in action bar
fix per mindyp

Change-Id: I3d05073938a148c39e4e3a3ff71df0366c166bff
2012-03-06 16:59:15 -08:00
Andy Huang
0ee2a3ccee Fix conversation view problems in Email2
The JavaScript in the assets/ dir wasn't inherited from
UnifiedEmail, and UnifiedEmail's ProGuard flags were being
ignored.

Also refactor a bit of the makefile.

Change-Id: Ic3de41f3eb1882831d61b8ae34e4dd298660acdb
2012-03-06 16:36:38 -08:00
Mindy Pereira
53bbe02cc9 Remove second launcher.
Change-Id: Ifdf4bf6722fd6b94e24e6ee81e94028883404bac
2012-03-06 09:33:49 -08:00
Mindy Pereira
71b57354c1 Listen for application/email-ls so we can distinguish between email2/gmail2.
Change-Id: I1b30738b0d8a3f6830dfc6d67b6db385771bba15
2012-03-06 08:47:52 -08:00
Mindy Pereira
6ae4b080d4 Set compose to email2 until we get rid of the email app.
Email2 supports the compose intent.

Change-Id: I739ccb95b63806ed46dfa74b721b5a43665aa1c4
2012-03-06 08:24:22 -08:00
Mindy Pereira
a4abf7e944 Create shim activity for showing conv/ convlist from widget
Change-Id: Ifb0fd8e8c2d32dd52cfdc641fc973f085515bb54
2012-03-05 18:06:19 -08:00
Mindy Pereira
70470c9a01 Add widget to email2.
Change-Id: I66bbee2bc5317837d625b1acc037b75056cfc277
2012-03-05 17:26:57 -08:00
Paul Westbrook
27282ed34a Change the authority for Email2's account cache provider
Allow the account cache cursor to have the notification uri set

Change-Id: I8b01ada0b787fe7a709ad7feacacb91acc3da826
2012-03-05 16:21:14 -08:00
Paul Westbrook
39b028fb4d Change usage of AccountCacheProvider
Change-Id: I3e2f14d5ee0f69c7c3527e7a511d84f9efed2df7
2012-03-01 15:42:31 -08:00
Marc Blank
fd077592ee Use EmailProvider to create account list
Change-Id: Iedd99ecb95066c3b7e089e3b987a0caed44b97e5
2012-02-27 13:22:45 -08:00
Paul Westbrook
89ad6382c9 Switch email2 to use the MailActivity
Change-Id: If2ea0c27d2d16c397b29c50366b2ae06282607a8
2012-02-21 10:49:57 -08:00
Paul Westbrook
d9ce667c6b Merge "Mark the name of the app not translatable" 2012-02-13 14:31:44 -08:00
Paul Westbrook
cbdff168b3 Mark the name of the app not translatable
Bug: 6006118

Change-Id: I308d166778999e65d3021a37d999083866136578
2012-02-13 14:09:49 -08:00
Eric Fischer
7a1cedbe1f Import translations.
Change-Id: I7fc85bdd9a77151149a87f794b1c0b1e1f9d0444
2012-02-13 12:19:01 -08:00
Paul Westbrook
3a420bed83 Use unique boot intent for Email2
Change-Id: Iffbedd93317676ddc1b25400c46fd016f26e0ba3
2012-02-09 14:55:11 -08:00
Paul Westbrook
47cbfe7147 First pass at a Email2 overlay of UnifiedEmail
Change-Id: I41de9a5307d56f358bc523bb139cdf90a0786dae
2012-02-09 14:43:32 -08:00