Commit Graph

9910 Commits

Author SHA1 Message Date
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
Baligh Uddin 2c36f2bd85 am 05032724: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-mail-algol
* commit '050327247bba823e89192f4e1de01b78212c7898':
  Import translations. DO NOT MERGE
2014-04-08 02:27:42 +00:00
Baligh Uddin 050327247b Merge "Import translations. DO NOT MERGE" into ub-mail-algol 2014-04-08 02:22:53 +00:00
Baligh Uddin 9651716041 Merge "Import translations. DO NOT MERGE" into ub-mail-master 2014-04-08 02:22:47 +00:00
Tony Mantler fdc8a744b5 am 142f12ea: Merge "Fix IMAP attachment upsync for forwarded messages" into ub-mail-algol
* commit '142f12ea934444e8ecd0a06be4aeb56439546e13':
  Fix IMAP attachment upsync for forwarded messages
2014-04-07 23:57:48 +00:00
Tony Mantler 142f12ea93 Merge "Fix IMAP attachment upsync for forwarded messages" into ub-mail-algol 2014-04-07 23:54:32 +00:00
Tony Mantler 84dfa15541 Fix IMAP attachment upsync for forwarded messages
b/13883967

Change-Id: I496663144c41fa6353883bb77fa35fb14d1cfa07
2014-04-07 16:26:04 -07:00
Martin Hibdon e48195bfdc am 94acc8e4: Merge "Fix the names of the save state contants" into ub-mail-algol
* commit '94acc8e485dc5fbcd6cf11104a9f2ac9c14f62e5':
  Fix the names of the save state contants
2014-04-07 23:21:16 +00:00
Martin Hibdon 426a953479 am 763bd628: update email version
* commit '763bd628d755bad493b0961cdec8d7e39b56ffe1':
  update email version
2014-04-07 23:21:15 +00:00
Martin Hibdon 94acc8e485 Merge "Fix the names of the save state contants" into ub-mail-algol 2014-04-07 23:17:45 +00:00
Martin Hibdon 763bd628d7 update email version
Change-Id: Id93dac8ad7b94fe3cff1e8a015b100b2c9f9c0b0
2014-04-07 15:57:43 -07:00
Martin Hibdon 2eb7f1babc Fix the names of the save state contants
b/13624066

Change-Id: I0fabcfbf659e51de3dfe2fc9b72bd88f86e576a6
2014-04-07 15:36:53 -07:00
Scott Kennedy 80444f0d26 Merge "Don't assume ComposeActivity's class name won't change" into ub-mail-master 2014-04-07 21:49:43 +00:00
Scott Kennedy ed659b0b11 Don't assume ComposeActivity's class name won't change
Instead, use a generic intent action that will just launch whichever
ComposeActivity the current app needs.

Change-Id: Iaefed106107bef7bd1f9d5086800862ceb42c009
2014-04-07 14:31:21 -07:00
Martin Hibdon 268b75f818 am a8474c52: Merge "Save and restore sync interval values and strings" into ub-mail-algol
* commit 'a8474c5273f9cfd5e9e4750f9ab9af94f3894635':
  Save and restore sync interval values and strings
2014-04-07 21:14:12 +00:00
Martin Hibdon a8474c5273 Merge "Save and restore sync interval values and strings" into ub-mail-algol 2014-04-07 21:08:29 +00:00
Martin Hibdon ddcb95f0e7 Save and restore sync interval values and strings
b/13624066

Change-Id: I14c243a7f7ae71e5d6fbdedda328dc01bb2eae85
2014-04-07 13:30:58 -07:00
Baligh Uddin fb334eb5cb Import translations. DO NOT MERGE
Change-Id: I8db8bde4cc35a52217b23212ef5f55c94a3278e7
Auto-generated-cl: translation import
2014-04-07 13:13:33 -07:00
Baligh Uddin 74826a68db Import translations. DO NOT MERGE
Change-Id: I96985f3384c3dd652a1facf74d0750a061569deb
Auto-generated-cl: translation import
2014-04-07 13:11:26 -07:00
Tony Mantler 2f638fb4f5 am 021fb3cd: More layout tweaks
* commit '021fb3cd78f5ef458fcb3203a7c0c8fd32a540fa':
  More layout tweaks
2014-04-07 18:46:49 +00:00
Tony Mantler 021fb3cd78 More layout tweaks
b/13640507

Change-Id: I0392671df101e263aba89abc8b949fe906f34ed0
2014-04-07 11:37:37 -07:00
Tony Mantler b09dd77d95 am 6cbdd5bb: Fix more IME actions
* commit '6cbdd5bba0c9c68a3261e54b1cebff48459657d5':
  Fix more IME actions
2014-04-07 16:30:50 +00:00
Tony Mantler 6cbdd5bba0 Fix more IME actions
b/13544189

Change-Id: I5dbbf45a1b68cac2d63ba41c70daff9d33cbb492
2014-04-04 16:36:06 -07:00
Tony Mantler 4c0c00f3e4 am d1a48cb5: Merge "Fix IME actions for Names screen on setup flow" into ub-mail-algol
* commit 'd1a48cb5f4cb300677ef62a3cf64a4324d9516aa':
  Fix IME actions for Names screen on setup flow
2014-04-04 23:18:25 +00:00
Tony Mantler df2fe89e81 am c9df9390: Make "Manual setup" underlined
* commit 'c9df939011dbb54278afc32f5b4c0fabe940e0d3':
  Make "Manual setup" underlined
2014-04-04 23:18:25 +00:00