Commit Graph

8389 Commits

Author SHA1 Message Date
Andrew Sapperstein
8a282c1b33 am bc7cd75e: Prevent duplicate inboxes after upgrade.
* commit 'bc7cd75e9a8652bfa873007bcd12db2a140c7d73':
  Prevent duplicate inboxes after upgrade.
2013-05-29 18:14:23 -07:00
Andrew Sapperstein
bc7cd75e9a Prevent duplicate inboxes after upgrade.
Previously, we were not properly handling the
case-insensitive INBOX mailbox type. We are now
upgrading properly. Fixes b/8701883.

Change-Id: I61be5159e23dc3e9578e577e33bc00a63f56b525
2013-05-29 18:10:59 -07:00
Scott Kennedy
2b9f76b237 am ddca2a0d: Show unread count when virtual folder is selected
* commit 'ddca2a0dcbcd27d2d17b5d5273eee2004fbcdf7c':
  Show unread count when virtual folder is selected
2013-05-28 15:24:58 -07:00
Scott Kennedy
ddca2a0dcb Show unread count when virtual folder is selected
We were not populating the unread count for virtual folders in one of
the two code paths, which resulted in the count disappearing from
the folder list whenever that folder was selected.

By moving the count code into getVirtualMailboxRow(), it will always
be called, so the count will always show up.

Change-Id: Ibb947ec6ed761babbcf162dbab38f44a6150d5e3
2013-05-28 14:59:22 -07:00
Yu Ping Hu
db059dbddf am d557e2b4: Increment Email version number.
* commit 'd557e2b43058c05aa4e0e501767deaa3dcebfa07':
  Increment Email version number.
2013-05-24 19:58:18 -07:00
Yu Ping Hu
d557e2b430 Increment Email version number.
Change-Id: I5a878e80189dc4ef3e1aee3a80ca06ee47b10ac5
2013-05-24 16:32:56 -07:00
Andrew Sapperstein
5a5af63898 am 642c6775: Delete build directory.
* commit '642c6775ded9b9c4a9db6411612da0a5095d14b1':
  Delete build directory.
2013-05-24 13:40:23 -07:00
Andrew Sapperstein
642c6775de Delete build directory.
To streamline our build, I've gone through
and eliminated the redundant build directory.
Strings in build/res have been moved into the
regular res/ directory and the Android.mk
file has been updated to no longer use the
non-existent build directory at all. Fixes b/9105428.

Change-Id: I93288068dceb13ad0a9a5396eb88335e3ecd65f1
2013-05-24 13:36:21 -07:00
Yu Ping Hu
287b6100cb am fb6a74b5: Merge "Handle redirection during validation." into jb-ub-mail-ur10
* commit 'fb6a74b5e0b1e4c0ae9d98e8f6cb70c805f8435e':
  Handle redirection during validation.
2013-05-23 15:53:45 -07:00
Yu Ping Hu
fb6a74b5e0 Merge "Handle redirection during validation." into jb-ub-mail-ur10 2013-05-23 22:52:39 +00:00
Yu Ping Hu
c28347552e Handle redirection during validation.
This allows the validator to tell the app that
it should use a different host.

Change-Id: Ie42c32aa7aea83e4d95d2b82b88225036b2407a9
2013-05-23 15:11:25 -07:00
Andrew Sapperstein
6724f36e80 am e43224f7: Merge "Return raw folder in respond()." into jb-ub-mail-ur10
* commit 'e43224f7ae10dcaf9b572bc0e6186beacb921f77':
  Return raw folder in respond().
2013-05-23 13:10:07 -07:00
Andrew Sapperstein
e43224f7ae Merge "Return raw folder in respond()." into jb-ub-mail-ur10 2013-05-23 19:02:24 +00:00
Andrew Sapperstein
f3618c2320 Return raw folder in respond().
To get the name of the folder, we need
the conversation cursor's respond method
to return a Folder object. Now it does.

Also refactored a getFolder method in
WidgetProvider to be in EmailProvider so
anyone can use it.

Change-Id: I55ee180955ff4f4be7012ed6b5dda596e8e9d236
2013-05-23 11:55:43 -07:00
Yu Ping Hu
2546a51a1c am 7283aea8: am 8b4f04a5: Merge "Auto-advance policy accept by triggering syncs." into jb-ub-mail-ur9
* commit '7283aea81c519521a51b783b7dd26da498745daa':
  Auto-advance policy accept by triggering syncs.
2013-05-23 10:41:11 -07:00
Yu Ping Hu
7283aea81c am 8b4f04a5: Merge "Auto-advance policy accept by triggering syncs." into jb-ub-mail-ur9
* commit '8b4f04a5ab48ab76a131137516edb8abab63b6d2':
  Auto-advance policy accept by triggering syncs.
2013-05-23 10:40:05 -07:00
Yu Ping Hu
8b4f04a5ab Merge "Auto-advance policy accept by triggering syncs." into jb-ub-mail-ur9 2013-05-23 17:38:30 +00:00
Yu Ping Hu
bd1e0b79e4 Auto-advance policy accept by triggering syncs.
Exchange goes through multiple steps to set up accounts.
Each step requires a sync request to occur, so this change
requests syncs as necessary.

Bug: 9074056

Change-Id: I0f35a06409c6a77c82d004958ecc323cf8030ab4
2013-05-23 09:52:07 -07:00
Baligh Uddin
5e57db5ab6 am bb32ae60: (-s ours) am 2f955b3a: (-s ours) Import translations. DO NOT MERGE
* commit 'bb32ae60aa6222d4940aaf748416084a84a8b6d8':
  Import translations. DO NOT MERGE
2013-05-23 09:38:34 -07:00
Baligh Uddin
bb32ae60aa am 2f955b3a: (-s ours) Import translations. DO NOT MERGE
* commit '2f955b3a6ece75d4a378eac605ec327d5c9118b3':
  Import translations. DO NOT MERGE
2013-05-23 09:35:33 -07:00
Baligh Uddin
d73f576c56 am 1c63963f: (-s ours) Import translations. DO NOT MERGE
* commit '1c63963fc1f3a3bfc62a0860db1fc2dcdf697be8':
  Import translations. DO NOT MERGE
2013-05-23 09:35:20 -07:00
Baligh Uddin
2f955b3a6e Import translations. DO NOT MERGE
Change-Id: I9002b46266608299efe763cb0371b569ecf2a28f
Auto-generated-cl: translation import
2013-05-23 01:31:27 -07:00
Baligh Uddin
425428c34f Import translations. DO NOT MERGE
Change-Id: I244872da611e2b6b730c8c0d4aa9c0c86f703f12
Auto-generated-cl: translation import
2013-05-23 01:30:54 -07:00
Baligh Uddin
1c63963fc1 Import translations. DO NOT MERGE
Change-Id: I473ff2e830582ae5e767336edde6f238d7809ffb
Auto-generated-cl: translation import
2013-05-23 01:30:19 -07:00
Scott Kennedy
d5ab395bd6 am d8302b01: Ensure notifications get cancelled when necessary
* commit 'd8302b01faa8fc7f175c93e90458aa84e8a663c7':
  Ensure notifications get cancelled when necessary
2013-05-22 19:17:01 -07:00
Scott Kennedy
d8302b01fa Ensure notifications get cancelled when necessary
There were a few places calling the old notification code to cancel
notifications. These calls were completely unnecessary.

Also, when an account is removed, we now clear all notifications that
may exist for that account.

Bug: 7935576
Change-Id: I58f7e194c3f9a928e932b3b1b87475e7d3653b6a
2013-05-22 18:36:07 -07:00
Andrew Sapperstein
c06a06c85f am 3340827b: Adding drag-state drawable to folder item icons.
* commit '3340827bde61288016aac24c4b27d2546da0309b':
  Adding drag-state drawable to folder item icons.
2013-05-21 17:15:01 -07:00
Andrew Sapperstein
3340827bde Adding drag-state drawable to folder item icons.
Fixes b/8986628. Previously we had two states for
icons in the folder list (activated and default).
We now have a third state for when the app is in
drag mode and the folder is disabled which uses
a lighter grey icon. To make this work, we use
a custom drawable state (state_drag_mode) for
when drag is entered. Another CL will use this
new drag state for changing folder text color as well.

Change-Id: I4c752ac7b996fd026e706f8e592ec57326ac61bf
(cherry picked from commit 0670cddaf92475ff30c7bd05af337ffa12e9ca95)
2013-05-21 23:55:11 +00:00
Andrew Sapperstein
49a8994827 am e5145f6d: am b30058ef: Merge "Checking in the grey icons." into jb-ub-mail-ur9
* commit 'e5145f6d798484f510d12c1fd72d5218b6230e54':
  Checking in the grey icons.
2013-05-21 16:27:25 -07:00
Andrew Sapperstein
e5145f6d79 am b30058ef: Merge "Checking in the grey icons." into jb-ub-mail-ur9
* commit 'b30058ef8880bd36b24cc312448a1c19ec2c0ded':
  Checking in the grey icons.
2013-05-21 16:25:11 -07:00
Andrew Sapperstein
b30058ef88 Merge "Checking in the grey icons." into jb-ub-mail-ur9 2013-05-21 23:23:05 +00:00
Mark Wei
ca97837fe0 am 9ad402a4: am 29dc837d: Fix flashing conversation list reloads.
* commit '9ad402a4076d7a1313228388abf4c5b3cb7872c8':
  Fix flashing conversation list reloads.
2013-05-21 13:15:07 -07:00
Mark Wei
9ad402a407 am 29dc837d: Fix flashing conversation list reloads.
* commit '29dc837d80e3d9faa03f52147285a58e6fd835e8':
  Fix flashing conversation list reloads.
2013-05-21 13:14:06 -07:00
Mark Wei
29dc837d80 Fix flashing conversation list reloads.
The MergeCursor was not setting the notification uri and observers correctly.

Bug: 9051928
Change-Id: I920cd836aeb6fe550bf05a7e21bc4378ef9772a3
2013-05-21 12:49:25 -07:00
Andrew Sapperstein
1efcdcc2cd Checking in the grey icons.
Change-Id: I4d429a49db20a12d2b971df9e395ec685f5c29e6
2013-05-20 13:46:25 -07:00
Yu Ping Hu
6741362c82 am e70d3660: am c1ff8195: Merge "Read protocol version from validation bundle." into jb-ub-mail-ur9
* commit 'e70d3660d801c732f1a4460c0575604326b83f49':
  Read protocol version from validation bundle.
2013-05-17 18:00:50 -07:00
Yu Ping Hu
e70d3660d8 am c1ff8195: Merge "Read protocol version from validation bundle." into jb-ub-mail-ur9
* commit 'c1ff8195f6baf3c3ce4f1b2329a45f10944e2820':
  Read protocol version from validation bundle.
2013-05-17 17:59:33 -07:00
Yu Ping Hu
c1ff8195f6 Merge "Read protocol version from validation bundle." into jb-ub-mail-ur9 2013-05-18 00:58:37 +00:00
Yu Ping Hu
0d5e21d0fc Read protocol version from validation bundle.
Exchange used to just re-check version on first sync.
Version is known during validation so might as well use it.

Change-Id: I004fe671a1ad30a7cfe0a0659b74b20ee2136771
2013-05-17 17:30:43 -07:00
Baligh Uddin
3e50cd8a5d am dc33c30e: (-s ours) am 38c8811e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9
* commit 'dc33c30e3db8154ea1f759687e6387747c7e3763':
  Import translations. DO NOT MERGE
2013-05-17 16:09:06 -07:00
Baligh Uddin
dc33c30e3d am 38c8811e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9
* commit '38c8811e1a131648dff3c051b33517d631481ae3':
  Import translations. DO NOT MERGE
2013-05-17 16:06:52 -07:00
Baligh Uddin
65951df6e4 am 1171a23f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
* commit '1171a23f397c1c516c7ca724f16c214478567ef8':
  Import translations. DO NOT MERGE
2013-05-17 16:05:54 -07:00
Baligh Uddin
38c8811e1a Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9 2013-05-17 23:05:08 +00:00
Baligh Uddin
34bb2c6e9f Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11 2013-05-17 23:04:50 +00:00
Baligh Uddin
1171a23f39 Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10 2013-05-17 23:04:37 +00:00
Baligh Uddin
4ebc78d9c6 Import translations. DO NOT MERGE
Change-Id: Idb3d43620d75e92c02ca01e085ca572596cb5b87
Auto-generated-cl: translation import
2013-05-17 13:09:53 -07:00
Baligh Uddin
25c23c28a2 Import translations. DO NOT MERGE
Change-Id: I611bd9223b86ef5bc6e578e13f84d70f36e036a0
Auto-generated-cl: translation import
2013-05-17 13:09:18 -07:00
Baligh Uddin
1ccf41c843 Import translations. DO NOT MERGE
Change-Id: Idb1d75bb4d63707ad49a798e03a05f6f3ca94ce2
Auto-generated-cl: translation import
2013-05-17 13:08:44 -07:00
Yu Ping Hu
5ef0bea935 am 60ea22a0: am eb232290: Always request a folder refresh for new accounts.
* commit '60ea22a0f194528d7af0560c0e7a906526efda85':
  Always request a folder refresh for new accounts.
2013-05-17 12:35:58 -07:00
Yu Ping Hu
60ea22a0f1 am eb232290: Always request a folder refresh for new accounts.
* commit 'eb232290309aa3247d6c9b566e8490065a28f763':
  Always request a folder refresh for new accounts.
2013-05-17 12:34:02 -07:00