Commit Graph

7 Commits

Author SHA1 Message Date
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
2c82c60e56 Change rsc file order; remove unused xml files
Change-Id: Iffea850dc83c8480e6d1a03a5a8c94587b77c579
2012-03-15 13:43:21 -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
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
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
Paul Westbrook
47cbfe7147 First pass at a Email2 overlay of UnifiedEmail
Change-Id: I41de9a5307d56f358bc523bb139cdf90a0786dae
2012-02-09 14:43:32 -08:00