Commit Graph

8151 Commits

Author SHA1 Message Date
Scott Kennedy
4c47dadf18 Merge "Unify LogTag" into jb-ub-mail-ur10 2013-06-06 18:03:53 +00:00
Paul Westbrook
c1d56928b2 Add a limit to the Conversation query
Bug: 9294348
Change-Id: Ifedfe657f205adb1c8a12382b908f4b3b4346500
2013-06-06 10:08:22 -07:00
Scott Kennedy
560bfadc31 Unify LogTag
There is now only one LogTag class. The static initializer of
GmailApplication (existing) and EmailApplication (new) will now set
the log tag to "Gmail" and "Email", respectively. Up until that code
is run, it will be "UnifiedEmail".

"setprop log.tag.Gmail VERBOSE" (or .Email) will trigger all logs to
be printed as long as they go through LogUtils, regardless of what tag
is used by that individual log. This lets us still turn on logging
everywhere in one command, but also lets us use more descriptive tags
(like the class name).

And since we no longer have three com.android.mail.utils.LogTag
classes, builds will be much easier.

Also, we now use LogUtils everywhere.

Change-Id: I55f1c7a66ce50ead54877a13e40256422a56dc39
2013-06-05 20:06:15 -07:00
Andrew Sapperstein
f20ed13765 Merge "Refactoring to support eml viewer in UnifiedEmail." into jb-ub-mail-ur10 2013-06-04 22:38:59 +00:00
Andrew Sapperstein
6be411edd0 Refactoring to support eml viewer in UnifiedEmail.
Moved two files out of Email into UnifiedEmail and
removed their dependencies on EmailContent. As a result,
those classes now return the data directly via a data only
class.

Change-Id: Iaf0618dd6879c9dc2a41943d3d15428904b65768
2013-06-04 15:37:40 -07:00
Yu Ping Hu
f849c1c50d Increment Email version.
Change-Id: Id0f4ce9b987f188bcb7a3604efe6df9162a2e4e5
2013-06-04 12:50:35 -07:00
Baligh Uddin
bc15735eb8 Import translations. DO NOT MERGE
Change-Id: I3b1c94dd1e18f19a2de941018d92b96e8403d7c7
Auto-generated-cl: translation import
2013-06-03 12:41:12 -07:00
Andrew Sapperstein
91973256c2 Moved code out of emailcommon to UnifedEmail.
This CL is mostly just deletion since the new code
is in a new project.

Change-Id: I4aee519187a6ed7514c97d2a7a85ed29ea29d25f
2013-05-31 16:28:51 -07:00
Andrew Sapperstein
f5ed3d2c9d Merge "Add EmlViewerActivity to AndroidManifest.xml." into jb-ub-mail-ur10 2013-05-31 18:14:18 +00:00
Andrew Sapperstein
7500c15652 Add EmlViewerActivity to AndroidManifest.xml.
Change-Id: I6728999bf3f27b4c0b9c0664775a7b87c97690c1
2013-05-31 10:38:53 -07:00
Paul Westbrook
9d5ed9e7a8 Added logging, and switch to AsyncTask
Bug: 9111546

Change-Id: I287b07346bb1729c7a1afadbc0c94a0d37df92f8
2013-05-29 20:17:17 -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
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
d557e2b430 Increment Email version number.
Change-Id: I5a878e80189dc4ef3e1aee3a80ca06ee47b10ac5
2013-05-24 16:32:56 -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
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
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
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
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
2f955b3a6e Import translations. DO NOT MERGE
Change-Id: I9002b46266608299efe763cb0371b569ecf2a28f
Auto-generated-cl: translation import
2013-05-23 01:31:27 -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
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
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
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
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
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
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
38c8811e1a Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9 2013-05-17 23:05:08 +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
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
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
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
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
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