Commit Graph

61 Commits

Author SHA1 Message Date
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