Merge "Hardware Search button doesn't work" into ub-mail-master

This commit is contained in:
James Lemieux 2014-01-28 19:42:25 +00:00 committed by Android (Google) Code Review
commit 2d9cee433d
2 changed files with 2 additions and 0 deletions

View File

@ -3047,6 +3047,7 @@ public class EmailProvider extends ContentProvider {
if (TextUtils.equals(context.getString(R.string.protocol_imap), protocol) ||
TextUtils.equals(context.getString(R.string.protocol_legacy_imap), protocol)) {
capabilities = AccountCapabilities.SYNCABLE_FOLDERS |
AccountCapabilities.SERVER_SEARCH |
AccountCapabilities.FOLDER_SERVER_SEARCH |
AccountCapabilities.UNDO |
AccountCapabilities.DISCARD_CONVERSATION_DRAFTS;

View File

@ -152,6 +152,7 @@ public class ImapService extends Service {
@Override
public int getCapabilities(Account acct) throws RemoteException {
return AccountCapabilities.SYNCABLE_FOLDERS |
AccountCapabilities.SERVER_SEARCH |
AccountCapabilities.FOLDER_SERVER_SEARCH |
AccountCapabilities.UNDO |
AccountCapabilities.DISCARD_CONVERSATION_DRAFTS;