Commit Graph

8427 Commits

Author SHA1 Message Date
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
Yu Ping Hu
eb23229030 Always request a folder refresh for new accounts.
Change-Id: I396293f39b7f24ebf67e7619ce19765e1229f56b
2013-05-17 12:10:10 -07:00
Andrew Sapperstein
e5fd059ee4 am 83b4ff72: am 53836e57: Enable "move to" from trash.
* commit '83b4ff7217a90d80efdcf4ff20ba5dbf8da9a136':
  Enable "move to" from trash.
2013-05-16 18:04:44 -07:00
Andrew Sapperstein
83b4ff7217 am 53836e57: Enable "move to" from trash.
* commit '53836e572eb4b402140a02da949f3e3d0ca146ed':
  Enable "move to" from trash.
2013-05-16 18:02:49 -07:00
Andrew Sapperstein
53836e572e Enable "move to" from trash.
Fixes b/8986915. Forgot to set a flag in the
FolderCapabilities.

Change-Id: I202e46d89fe5705e3ddd05b1fbd0c8cd9f8fae0d
2013-05-16 17:55:42 -07:00
Andrew Sapperstein
86a554a9cd am f57159ca: am 5f1dbb7e: Merge "Using proper Unread icon for unread "folder"." into jb-ub-mail-ur9
* commit 'f57159caf7bf114e3da75429f7ebd1ea83ea786b':
  Using proper Unread icon for unread "folder".
2013-05-16 11:58:24 -07:00
Andrew Sapperstein
f57159caf7 am 5f1dbb7e: Merge "Using proper Unread icon for unread "folder"." into jb-ub-mail-ur9
* commit '5f1dbb7e66da7c4abca2cc52b84744b4bc8055ff':
  Using proper Unread icon for unread "folder".
2013-05-16 11:57:08 -07:00
Andrew Sapperstein
5f1dbb7e66 Merge "Using proper Unread icon for unread "folder"." into jb-ub-mail-ur9 2013-05-16 18:55:50 +00:00
Andrew Sapperstein
7e75311926 Using proper Unread icon for unread "folder".
Fixes b/8967972.

Change-Id: I1089fdeac5803fd6f9bed19d1c22d0629814ba87
2013-05-16 11:53:23 -07:00
Yu Ping Hu
f9671d01d1 am a0b95c8f: am 67b38031: Merge "Changes to support cleaving sync out of ExchangeService." into jb-ub-mail-ur9
* commit 'a0b95c8f2b38a51b23dc94679948c9f3e1c8b754':
  Changes to support cleaving sync out of ExchangeService.
2013-05-16 11:49:03 -07:00
Yu Ping Hu
a0b95c8f2b am 67b38031: Merge "Changes to support cleaving sync out of ExchangeService." into jb-ub-mail-ur9
* commit '67b38031abbbf35b10854d3c8d3b4adf7cb08aaa':
  Changes to support cleaving sync out of ExchangeService.
2013-05-16 11:46:46 -07:00
Yu Ping Hu
67b38031ab Merge "Changes to support cleaving sync out of ExchangeService." into jb-ub-mail-ur9 2013-05-16 18:43:26 +00:00
Yu Ping Hu
7c3f85885c Changes to support cleaving sync out of ExchangeService.
Change-Id: Idbfff4ddc8fca4829228d04816d40a4ab9639382
2013-05-15 15:04:59 -07:00