Commit Graph

9803 Commits

Author SHA1 Message Date
Tony Mantler
8c91d2e34b am f501d41c: Merge "Add cross-fade to setup flow" into ub-mail-algol
* commit 'f501d41c7b652ec82f077ad90e11544dc02d0563':
  Add cross-fade to setup flow
2014-04-18 22:39:34 +00:00
Tony Mantler
f501d41c7b Merge "Add cross-fade to setup flow" into ub-mail-algol 2014-04-18 22:37:32 +00:00
Tony Mantler
b5fd6b8905 Add cross-fade to setup flow
b/14164262

Change-Id: I41fe0bf5661d9f7a2b5051604c0b6dbfc4506414
2014-04-18 14:54:55 -07:00
Tony Mantler
42a4dbbf93 Refactor addMailbox() a bit and clean up warnings
Change-Id: I8497f74ec61c380ae4e69487121c50933f568965
2014-04-18 14:28:28 -07:00
Tony Mantler
3c73a04bec Continue purging the unused reply parts
Change-Id: I47b5bbe50ba36e68ad7ba80647f401b992660ba1
2014-04-18 14:04:23 -07:00
Tony Mantler
f0db9ce9ab Clean up LegacyConversions
Change-Id: I9cb9bf8a08663004a497af9f52e3ab0647bd2168
2014-04-18 13:36:18 -07:00
Tony Mantler
a5ba759443 am b2fd4d25: Merge "Make AccountSettings implement callbacks for check settings dialog" into ub-mail-algol
* commit 'b2fd4d25767938bf693aba12f73f1dd0ee462427':
  Make AccountSettings implement callbacks for check settings dialog
2014-04-18 19:03:26 +00:00
Tony Mantler
abf887ff22 am 0d70ee2c: Merge "Fix layout of standalone credential activity" into ub-mail-algol
* commit '0d70ee2cb9bc4bc1c515e69b00825972b2ced9d3':
  Fix layout of standalone credential activity
2014-04-18 19:03:25 +00:00
Tony Mantler
b2fd4d2576 Merge "Make AccountSettings implement callbacks for check settings dialog" into ub-mail-algol 2014-04-18 18:21:21 +00:00
Tony Mantler
0d70ee2cb9 Merge "Fix layout of standalone credential activity" into ub-mail-algol 2014-04-18 18:17:53 +00:00
Tony Mantler
1c594b8050 Make AccountSettings implement callbacks for check settings dialog
b/14120112

Change-Id: I9834a772e90d2d13f16a84a70651286759bc9dbc
2014-04-18 11:16:57 -07:00
Tony Mantler
7b350f101c Fix layout of standalone credential activity
b/14144228

Change-Id: Ic75f2444b74e101d25afd312ba94f5df3e8204c3
2014-04-18 11:06:24 -07:00
Tony Mantler
502f6ad7ea Tidy up saveAttachmentBody
Change-Id: I1852ad7d94eec15feb661a87f81869a554d595af
2014-04-17 16:19:23 -07:00
Tony Mantler
fd69e5b036 Purge unused/obsolete body fields
Change-Id: Idafa09b58f5753e4cb3cad754c861cc8e3d80c34
2014-04-17 14:32:10 -07:00
Tony Mantler
0e26184ac7 am 6529f2c9: Add some null-checks
* commit '6529f2c99d24f0dd801ed142ce946b46c92d5e9f':
  Add some null-checks
2014-04-17 18:56:23 +00:00
Tony Mantler
6529f2c99d Add some null-checks
b/14117436
b/14120112

Change-Id: I0f56e036ec1a78887523d90ab4e6cda3a05accdf
2014-04-17 11:50:25 -07:00
Andrew Sapperstein
592a85d97d am 1bb18931: Send PLID with message instead of conversation.
* commit '1bb18931e29dfe55a9b3368bd2393ac57c5fdebb':
  Send PLID with message instead of conversation.
2014-04-17 17:20:04 +00:00
Tony Mantler
9caaebb142 Bypass the cursor completely when passing message within EmailContent contexts
We should investigate using PFDs when passing to the UI layer too, for consistency

Change-Id: I21ad1987926b93af20287ae8e49bfc7a4ad99570
2014-04-16 16:49:29 -07:00
Andrew Sapperstein
1bb18931e2 Send PLID with message instead of conversation.
Fixes b/13748439. Sending with conversation required
server-side changes and wasn't actually more memory efficient.
Arguably it would be less efficient.

Change-Id: I8e1be03e183c65e169da5152a4763d5f80460bb9
2014-04-16 11:48:59 -07:00
Tony Mantler
1b8cb007ba am cdfffcf4: Merge "Don\'t re-add fragment if it\'s already been added" into ub-mail-algol
* commit 'cdfffcf4609336445cbaade49581d07ad10e7bf1':
  Don't re-add fragment if it's already been added
2014-04-16 17:46:34 +00:00
Tony Mantler
cdfffcf460 Merge "Don't re-add fragment if it's already been added" into ub-mail-algol 2014-04-16 17:44:04 +00:00
Tony Mantler
4822b266ef Don't re-add fragment if it's already been added
b/14088388

Change-Id: Ie86220f2ab3bf6286ba206248b79291a51b04fad
2014-04-16 10:31:45 -07:00
Tony Mantler
131baa26a1 am 75d60f04: Merge "Null check mCheckFrequency before using" into ub-mail-algol
* commit '75d60f045b8344f7a894e895c1bd95957f5e24bf':
  Null check mCheckFrequency before using
2014-04-16 17:20:17 +00:00
Tony Mantler
75d60f045b Merge "Null check mCheckFrequency before using" into ub-mail-algol 2014-04-16 17:17:15 +00:00
Tony Mantler
8a12526a7f am 91ad2631: Be more blunt about saving the right fragment reference
* commit '91ad26315a8769f92af469b06e24033ffd9e6caf':
  Be more blunt about saving the right fragment reference
2014-04-16 17:17:03 +00:00
Tony Mantler
0151a6af62 Null check mCheckFrequency before using
b/14091609

Change-Id: I796774b7133ec68382d2580d0b1cde347aa143f8
2014-04-16 10:11:55 -07:00
Tony Mantler
91ad26315a Be more blunt about saving the right fragment reference
Apparently fragment IDs get recycled so storing the fragment reference
in a bundle can return the wrong fragment later, so that's great.

b/14094356

Change-Id: I7ce4ae46f51371b4179c7e85c343ab86162b5a95
2014-04-16 10:05:44 -07:00
Baligh Uddin
1ad024e722 am 03d600ca: (-s ours) Import translations. DO NOT MERGE
* commit '03d600caac8da57eaff578018f7d97554bc46b76':
  Import translations. DO NOT MERGE
2014-04-16 15:44:48 +00:00
Baligh Uddin
fcc325e01f Merge "Import translations. DO NOT MERGE" into ub-mail-master 2014-04-16 15:42:47 +00:00
Scott Kennedy
f2d2b71bb7 am 5e14d846: Fix reply from notification actions
* commit '5e14d8467a9b1cdcd5dda3d227f6ef3ed44523ba':
  Fix reply from notification actions
2014-04-15 23:51:21 +00:00
Scott Kennedy
5e14d8467a Fix reply from notification actions
Bug: 13983465
Change-Id: Ie28fc8b80be4a4a54ca7fc8066268fba906c4300
2014-04-15 16:24:07 -07:00
Tony Mantler
204982897b Merge "Bypass the cursor window for email bodies" into ub-mail-master 2014-04-15 22:43:57 +00:00
Tony Mantler
f678a18b69 Bypass the cursor window for email bodies
b/11787468

Change-Id: Iba5faa5b825357144d07ec4dfcf010c6af50496d
2014-04-15 15:18:17 -07:00
Scott Kennedy
90118635a9 am 1f4d6e9a: Use the correct R import
* commit '1f4d6e9aa9f6f219f14951e2966043ac379e262c':
  Use the correct R import
2014-04-15 22:06:45 +00:00
Scott Kennedy
1f4d6e9aa9 Use the correct R import
Change-Id: I087087079a47df7693dbec662d53dc73f7bcba43
2014-04-15 14:49:41 -07:00
Tony Mantler
845db97119 Fix some missed class renames
Change-Id: I82c9e21049096525cc55fa57e5cc307844014832
2014-04-15 11:50:20 -07:00
Baligh Uddin
235228038b Import translations. DO NOT MERGE
Change-Id: I68dc6af2a2da1685cbad1785aadf33f49bb07202
Auto-generated-cl: translation import
2014-04-14 13:40:31 -07:00
Baligh Uddin
03d600caac Import translations. DO NOT MERGE
Change-Id: Ibe980c8d37438bcce29d82ff9ed03574d8297fcb
Auto-generated-cl: translation import
2014-04-14 13:39:15 -07:00
Tony Mantler
3dd85723a1 Cleanup in EmailContent
Change-Id: Ifa251eb206779f59ea003f99395d454c7e407bc2
2014-04-14 12:54:39 -07:00
Tony Mantler
80d7676985 Remove flawed body-mangling code, add some finals
Change-Id: Ia3dc53cc36e5c2912d4366d4e1a0d69b87c4409b
2014-04-11 14:50:22 -07:00
Andy Huang
bdec330054 am 135853d3: tighten inline attachment view intent builder
* commit '135853d3bc7e2007250442af29a2d10f8b00052c':
  tighten inline attachment view intent builder
2014-04-10 23:20:42 +00:00
Andy Huang
135853d3bc tighten inline attachment view intent builder
Bug: 7659807
Change-Id: I845199fd6848cb5c0a7ebfd2f63f8c3045fffa36
(cherry picked from commit 5687c6dade)
2014-04-10 23:14:07 +00:00
Martin Hibdon
add018e4fd am 2172ac41: Merge "Correctly initialize the authentication view" into ub-mail-algol
* commit '2172ac410add578021715d34a92c1bcaff4f3560':
  Correctly initialize the authentication view
2014-04-10 23:12:33 +00:00
Tony Mantler
d1861317b9 am 55dbea9f: Actually install the correct views when credentials fragment is in standalone mode
* commit '55dbea9fe0a9f5f7a7460c82f19e7c33c3a7edef':
  Actually install the correct views when credentials fragment is in standalone mode
2014-04-10 23:12:29 +00:00
Martin Hibdon
2172ac410a Merge "Correctly initialize the authentication view" into ub-mail-algol 2014-04-10 23:09:46 +00:00
Tony Mantler
da9189990a am c83366c8: Fix some crashes and misbehavior with account settings screens
* commit 'c83366c88770f336a8e9976af42389c616de0b62':
  Fix some crashes and misbehavior with account settings screens
2014-04-10 23:06:15 +00:00
Tony Mantler
55dbea9fe0 Actually install the correct views when credentials fragment is in standalone mode
b/13638835

Change-Id: I7800cf0638097ae70c0b22384e2effc09c6ab2e3
(cherry picked from commit fe7c3228eb)
2014-04-10 23:06:08 +00:00
Martin Hibdon
12e7d101e8 Correctly initialize the authentication view
b/13961322

Change-Id: I96067b30c54131cc65a0282b118f9821d363113b
2014-04-10 16:01:06 -07:00
Tony Mantler
c83366c887 Fix some crashes and misbehavior with account settings screens
b/13954490

Change-Id: Ic81b342495a46573cb1fe78cad1f4888fffc4ae8
2014-04-10 15:28:15 -07:00
Tony Mantler
e8c4c22268 Enable Empty Trash in Email
Add markContentsSeen() and emptyFolder() to EmailConversationCursor.
Add 'purge folder' URI for delete() call in EmailProvider.

Change-Id: I2f65f877f8f4e8376eb5c2149b5051931c2ac083
2014-04-10 12:06:43 -07:00