Commit Graph

8394 Commits

Author SHA1 Message Date
Paul Westbrook bc47398187 Merge Email1 into MR1
Change-Id: I45289d46b65faffc7a3a3dd46382899162f3aaab
2012-09-24 15:32:00 -07:00
Paul Westbrook 335ba2c4ea am 986881ef: Fix multi message notifications
* commit '986881efe6029ad4382371e2da4e597312eda51c':
  Fix multi message notifications
2012-09-24 08:43:16 -07:00
Marc Blank ee6ca4e7b2 am 35177585: Merge "Remove Imap2 from AOSP tree" into jb-ub-mail
* commit '35177585a24b608582536c3d2c6633f8ee486511':
  Remove Imap2 from AOSP tree
2012-09-24 08:43:15 -07:00
Vikram Aggarwal 24e11036e7 am 016310a0: Fix account order.
* commit '016310a054d54c11490244f2725f5323f4b2ee35':
  Fix account order.
2012-09-24 08:43:13 -07:00
Marc Blank d47027b92d am 114e3149: Return contentUri for all attachments
* commit '114e314968f507b4237e693d279befe261b00f02':
  Return contentUri for all attachments
2012-09-24 08:43:12 -07:00
Marc Blank bb34ef2d96 am 54347010: Allow legacy imap to sync
* commit '54347010fbbdd3ae1dea5b0e282514c640e16a5f':
  Allow legacy imap to sync
2012-09-24 08:43:10 -07:00
Marc Blank 2bbb93750f am 9f05983f: Merge "Prevent duplicate imap folders" into jb-ub-mail
* commit '9f05983f28e0450e642063ceb4d86b98450deccd':
  Prevent duplicate imap folders
2012-09-24 08:43:09 -07:00
Paul Westbrook 986881efe6 Fix multi message notifications
When multiple messages are received, now the View intent
will take the user to to contents of the mailbox, instead of
the viewing the last message

I have filed bug 7216375 to track the issue about receiving
multiple messages in different syncs

Bug: 7129870

Change-Id: I3fdf4680c62565615fcbefc75d72c2a721942604
2012-09-23 13:11:06 -07:00
Marc Blank 35177585a2 Merge "Remove Imap2 from AOSP tree" into jb-ub-mail 2012-09-23 10:25:24 -07:00
Marc Blank 0629f67215 Remove Imap2 from AOSP tree
Bug: 7215459

Change-Id: I0808920c12d0b43455e213fd47c90f4eaee7ee1c
2012-09-22 19:10:27 -07:00
Vikram Aggarwal 016310a054 Fix account order.
The combined account is added both at the top and the bottom
currently: Check L.3103 of EmailProvider.java.

Bug: 7100404 Order of accounts in email is broken

Change-Id: I1cbff04efbb0b50630c655918ffdfa4a5d11c2f7
2012-09-22 16:08:18 -07:00
Marc Blank 114e314968 Return contentUri for all attachments
Bug: 7189815
Change-Id: If76d3a2038b3260fa44a7662854b03f7b6a1696c
2012-09-21 21:18:10 -07:00
Marc Blank 54347010fb Allow legacy imap to sync
* Remove old (and dangerous) constants

Bug: 7210754
Bug: 7212263

Change-Id: I6a1463a653c5c4823a96c9fbb9ca37e53a45b48a
2012-09-21 18:03:17 -07:00
Marc Blank 9f05983f28 Merge "Prevent duplicate imap folders" into jb-ub-mail 2012-09-21 17:45:36 -07:00
Marc Blank 6bbbc0d57c Prevent duplicate imap folders
Bug: 7212259
Change-Id: Iad43956c4caaf5a61c483af6ade91fa046342879
2012-09-21 17:37:12 -07:00
Baligh Uddin b0d793abd2 am c4e9ebc6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
* commit 'c4e9ebc6f6a7cd1522130c7439ab4c51303cbd60':
  Import translations. DO NOT MERGE
2012-09-21 15:14:29 -07:00
Baligh Uddin c4e9ebc6f6 Merge "Import translations. DO NOT MERGE" into jb-ub-mail 2012-09-21 15:12:17 -07:00
Baligh Uddin 0151730686 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-21 15:11:48 -07:00
Baligh Uddin 3073a047c8 Import translations. DO NOT MERGE
Change-Id: I83c5638bf4175e6e8ff00794578e26506f3db92c
Auto-generated-cl: translation import
2012-09-21 12:58:35 -07:00
Baligh Uddin c34081f34b Import translations. DO NOT MERGE
Change-Id: I90df10c743be056e1545b760293e336707ff46b3
Auto-generated-cl: translation import
2012-09-21 12:57:39 -07:00
Marc Blank 2b5e54f059 am 78b8c048: Add another test for "incomplete" accounts
* commit '78b8c04898c04890b757fbd83df9666e0a9068f5':
  Add another test for "incomplete" accounts
2012-09-21 12:45:21 -07:00
Marc Blank 78b8c04898 Add another test for "incomplete" accounts
* We have been erroneously marking some accounts "incomplete" and
  this can cause reconciliation to fail after deleting the
  accounts in Settings.
* Still need to investigate why the flag isn't cleared at times...

Bug: 7148506
Bug: 7166598
Change-Id: I0059580a6e4b6a5c54c09b8409c4358ff707ff77
2012-09-21 11:27:19 -07:00
Marc Blank 8218facec8 am 733a1146: Add id to HashCode equals()
* commit '733a11467cc681d956eef9c5e98695f84743c39b':
  Add id to HashCode equals()
2012-09-21 10:34:47 -07:00
Marc Blank 733a11467c Add id to HashCode equals()
Change-Id: Ibe5d8cbfb88884e38505d9daf0b413730e1fb333
2012-09-21 10:30:22 -07:00
Marc Blank c10a57f966 am b6992942: Merge "Restore Imap1" into jb-ub-mail
* commit 'b6992942aa1f7756160173c93533c7e8963b76a0':
  Restore Imap1
2012-09-21 09:05:57 -07:00
Marc Blank b6992942aa Merge "Restore Imap1" into jb-ub-mail 2012-09-21 09:04:44 -07:00
Marc Blank 5c52385838 Restore Imap1
* Restore Imap1 code
* Legacy users will use Imap1
* Existing Imap2 users will continue to use Imap2
* New accounts will be created in Imap1
* More to follow

Bug: 7203993

Change-Id: I8b86fcada59a854fd464d5269c94d00ebae85459
2012-09-21 08:29:09 -07:00
Baligh Uddin c44d36498d am 37d6afb9: (-s ours) Import translations. DO NOT MERGE
* commit '37d6afb98a16fe5e85f591f7dbbf2ee1765f8f3a':
  Import translations. DO NOT MERGE
2012-09-21 07:31:16 -07:00
Baligh Uddin 37d6afb98a Import translations. DO NOT MERGE
Change-Id: I5444c1bba3f50f8689cd4f00044257c54d163f44
Auto-generated-cl: translation import
2012-09-20 14:50:59 -07:00
Baligh Uddin 40f8505247 Import translations. DO NOT MERGE
Change-Id: I9146e37f56b75548527a365f881827d26cda5c17
Auto-generated-cl: translation import
2012-09-20 14:49:59 -07:00
Marc Blank f5bea52c5c am ec0af782: Merge "Quote username and password in login command" into jb-ub-mail
* commit 'ec0af7822c2321cf52b311b2f6bfbc37c9ee14db':
  Quote username and password in login command
2012-09-20 12:48:08 -07:00
Marc Blank ec0af7822c Merge "Quote username and password in login command" into jb-ub-mail 2012-09-20 11:13:29 -07:00
Marc Blank 6c477f5430 Quote username and password in login command
Bug: 7201914
Change-Id: Iff13a730c308198b01fdd3238149f54075b5d846
2012-09-20 09:57:39 -07:00
Paul Westbrook b6b843d8aa am 0a54d7ee: Merge "increment versionCode" into jb-ub-mail
* commit '0a54d7ee8184eb3cbe6daa63c7e67e94c3e2cfd4':
  increment versionCode
2012-09-20 09:02:19 -07:00
Paul Westbrook 0a54d7ee81 Merge "increment versionCode" into jb-ub-mail 2012-09-20 09:00:41 -07:00
Paul Westbrook 6e0816d9b0 am 652a9076: Hide reply all setting on tablets
* commit '652a907672165b63d715817ceb08bd010489dab2':
  Hide reply all setting on tablets
2012-09-20 08:59:48 -07:00
Yorke Lee 56991a7f98 am 4b4d984d: Merge "Correct icon for folder/account selection" into jb-ub-mail
* commit '4b4d984dd16bdee11d03b030fc74099defd50910':
  Correct icon for folder/account selection
2012-09-20 06:36:00 -07:00
Paul Westbrook 652a907672 Hide reply all setting on tablets
Since tablets have the space to fit both the reply and reply all buttons
there is no need to show this setting on these devices

Bug: 7190341
Change-Id: I8a911ee964be6af31b63286db53b335a9e4a8396
2012-09-19 23:10:09 -07:00
Paul Westbrook d4565b3e0d increment versionCode
Change-Id: I9d1eccc6b1dd0bd0fd6b342e6af151630f20a91e
2012-09-19 22:02:44 -07:00
Yorke Lee 4b4d984dd1 Merge "Correct icon for folder/account selection" into jb-ub-mail 2012-09-19 19:11:09 -07:00
Yorke Lee d33c8de4f0 Correct icon for folder/account selection
Bug: 7180129
Change-Id: I58fab9016e6e1f8be1ce5ac14d9d2e64f8fda051
2012-09-19 18:52:45 -07:00
Baligh Uddin 94f7984287 am f4325491: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail
* commit 'f432549144c6c86e3b6b00ee502701186868ab77':
  Import translations. DO NOT MERGE
2012-09-19 14:31:53 -07:00
Mark Wei d453442670 am 533c4ff9: Merge "Fix Email widget preview using wrong resource." into jb-ub-mail
* commit '533c4ff91979caca5cf71864f554a15f7ff560f3':
  Fix Email widget preview using wrong resource.
2012-09-19 14:31:50 -07:00
Marc Blank af6c077ac6 am 67439a3e: Add translatable=false as required
* commit '67439a3e3378bc50bbe47aa409258a1420831b11':
  Add translatable=false as required
2012-09-19 14:31:47 -07:00
Baligh Uddin f432549144 Merge "Import translations. DO NOT MERGE" into jb-ub-mail 2012-09-19 14:01:47 -07:00
Baligh Uddin ce5901fcf2 Import translations. DO NOT MERGE
Change-Id: I6440dd7def16da46c5c84a695cd13940c46cd0b1
Auto-generated-cl: translation import
2012-09-19 14:01:01 -07:00
Baligh Uddin b6e7bfa1d7 Import translations. DO NOT MERGE
Change-Id: I6e1e370b0e4622c955383fc952ccfd8a26b47b52
Auto-generated-cl: translation import
2012-09-19 14:00:10 -07:00
Mark Wei 533c4ff919 Merge "Fix Email widget preview using wrong resource." into jb-ub-mail 2012-09-19 13:46:34 -07:00
Marc Blank 67439a3e33 Add translatable=false as required
Bug: 7144392
Change-Id: Ibbe21ea46b443f18795d6266341b9fa995de521e
2012-09-19 13:34:02 -07:00
Marc Blank 0a836b8153 am 72d7dda9: Improve service dump a bit
* commit '72d7dda97d15c7bb5a25e0138436f9d9ca2f77b6':
  Improve service dump a bit
2012-09-19 13:05:14 -07:00