Commit Graph

9984 Commits

Author SHA1 Message Date
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
Baligh Uddin
cd940b68d3 am 14007246: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-mail-algol
* commit '1400724647a72af0b44842c85c8be4ba77f4911a':
  Import translations. DO NOT MERGE
2014-04-10 15:59:56 +00:00
Baligh Uddin
1400724647 Merge "Import translations. DO NOT MERGE" into ub-mail-algol 2014-04-10 15:57:10 +00:00
Baligh Uddin
f22af5f085 Merge "Import translations. DO NOT MERGE" into ub-mail-master 2014-04-10 15:57:07 +00:00
Tony Mantler
bae63123ec Merge "Move EmailConversationCursor out of EmailProvider" into ub-mail-master 2014-04-09 22:32:21 +00:00
Tony Mantler
0053401d07 Move EmailConversationCursor out of EmailProvider
Also tidy warnings in EmailProvider

Change-Id: Ib41011cc4b43adf0272be22bc7c054a99ff58309
2014-04-09 14:20:08 -07:00
Baligh Uddin
be90af0070 Import translations. DO NOT MERGE
Change-Id: I855e8fc6bb15c4b40ffd2fccae5e43b7a850455e
Auto-generated-cl: translation import
2014-04-09 13:47:35 -07:00
Baligh Uddin
1a1cb24849 Import translations. DO NOT MERGE
Change-Id: I1f3aebc4d148172bc491820a986da1e179e114c8
Auto-generated-cl: translation import
2014-04-09 13:46:32 -07:00
Martin Hibdon
816474e8ef am d896fa8a: Merge "Fix an NPE in sendCommandInternal" into ub-mail-algol
* commit 'd896fa8a2ea455a58deb415b9456e6fadefe3fd0':
  Fix an NPE in sendCommandInternal
2014-04-09 20:13:58 +00:00
Martin Hibdon
d896fa8a2e Merge "Fix an NPE in sendCommandInternal" into ub-mail-algol 2014-04-09 20:12:24 +00:00
Tony Mantler
61ce02ea47 am 9d06daa8: Increase padding above labels in setup flow
* commit '9d06daa8039cd934bcd17f8e14a4d3a926932a3c':
  Increase padding above labels in setup flow
2014-04-09 19:37:44 +00:00
Martin Hibdon
2a7411b57b Fix an NPE in sendCommandInternal
b/13929234

Change-Id: I362682bde3c24123178e68811604f0180c853598
2014-04-09 11:22:52 -07:00
Tony Mantler
9d06daa803 Increase padding above labels in setup flow
b/13640327

Change-Id: I54e98855566adc45dcd410186c2e7ea322dc1a58
2014-04-09 11:16:46 -07:00
Tony Mantler
9eaf30bf17 am 35bda06a: Fix NPE when configuring POP accounts, which don\'t have a background attachments setting
* commit '35bda06a1c1f5bb6a53e41cb88d6ac2005bbe415':
  Fix NPE when configuring POP accounts, which don't have a background attachments setting
2014-04-09 18:00:46 +00:00
Tony Mantler
049bfae98b am 84366ae2: Merge "Fix attachment loading for messages which have been forwarded" into ub-mail-algol
* commit '84366ae2735e541693b3bc016b86e468ff216cdc':
  Fix attachment loading for messages which have been forwarded
2014-04-09 18:00:45 +00:00
Tony Mantler
35bda06a1c Fix NPE when configuring POP accounts, which don't have a background attachments setting
b/13929109

Change-Id: Idd915ddaa55010c588ce7798dd23a403e538c8da
2014-04-09 10:24:04 -07:00
Tony Mantler
84366ae273 Merge "Fix attachment loading for messages which have been forwarded" into ub-mail-algol 2014-04-08 22:17:56 +00:00
Martin Hibdon
0680ba5e25 am d58b4904: Fix a potential stack overflow error
* commit 'd58b490479bbde719d3e8626382c04829be6bbca':
  Fix a potential stack overflow error
2014-04-08 22:01:12 +00:00
Martin Hibdon
d58b490479 Fix a potential stack overflow error
b/13906567

Change-Id: I21be980d4b4878ada0df6d3af706fee55afb4f2b
2014-04-08 14:35:53 -07:00
Tony Mantler
2aeb498d4e Fix attachment loading for messages which have been forwarded
These attachments have a contentUri where the attachment ID is not equal
to the ID of the actual attachment.

b/13900073

Change-Id: Ic62b8165be2e80bc47eac40dc9eb5ac53c3cd6c5
2014-04-08 14:18:56 -07:00