Disambiguate providers between AOSP and EmailGoogle
b/13323222 Change-Id: I7d10182973b57e4c2c306739a15237952a7e6c95
This commit is contained in:
parent
05f946e6cf
commit
9ef3c8b3f8
|
@ -332,7 +332,7 @@
|
||||||
<!-- additional activities -->
|
<!-- additional activities -->
|
||||||
|
|
||||||
<provider
|
<provider
|
||||||
android:authorities="com.android.email2.conversation.provider"
|
android:authorities="com.android.email.conversation.provider"
|
||||||
android:label="@string/conversation_content_provider"
|
android:label="@string/conversation_content_provider"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
android:name="com.android.mail.browse.EmailConversationProvider" >
|
android:name="com.android.mail.browse.EmailConversationProvider" >
|
||||||
|
@ -340,7 +340,7 @@
|
||||||
</provider>
|
</provider>
|
||||||
|
|
||||||
<provider
|
<provider
|
||||||
android:authorities="com.android.email2.accountcache"
|
android:authorities="com.android.email.accountcache"
|
||||||
android:label="@string/account_cache_provider"
|
android:label="@string/account_cache_provider"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
android:name="com.android.mail.providers.EmailAccountCacheProvider" >
|
android:name="com.android.mail.providers.EmailAccountCacheProvider" >
|
||||||
|
|
|
@ -832,6 +832,9 @@
|
||||||
<string name="intent_account_manager_entry" translatable="false">com.android.email.activity.setup.ACCOUNT_MANAGER_ENTRY</string>
|
<string name="intent_account_manager_entry" translatable="false">com.android.email.activity.setup.ACCOUNT_MANAGER_ENTRY</string>
|
||||||
<string name="intent_create_account" translatable="false">com.android.email.CREATE_ACCOUNT</string>
|
<string name="intent_create_account" translatable="false">com.android.email.CREATE_ACCOUNT</string>
|
||||||
<string name="authority_email_provider" translatable="false">com.android.email.provider</string>
|
<string name="authority_email_provider" translatable="false">com.android.email.provider</string>
|
||||||
|
<string name="authority_conversation_provider" translatable="false">com.android.email.conversation.provider</string>
|
||||||
|
<string name="authority_account_cache_provider" translatable="false">com.android.email.accountcache</string>
|
||||||
|
<string name="authority_suggestions_provider" translatable="false">com.android.email.suggestionsprovider</string>
|
||||||
<string name="protocol_legacy_imap" translatable="false">imap</string>
|
<string name="protocol_legacy_imap" translatable="false">imap</string>
|
||||||
<string name="protocol_imap" translatable="false">imap</string>
|
<string name="protocol_imap" translatable="false">imap</string>
|
||||||
<string name="protocol_pop3" translatable="false">pop3</string>
|
<string name="protocol_pop3" translatable="false">pop3</string>
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
|
|
||||||
package com.android.mail.browse;
|
package com.android.mail.browse;
|
||||||
|
|
||||||
|
import com.android.email.R;
|
||||||
import com.android.mail.browse.ConversationCursor.ConversationProvider;
|
import com.android.mail.browse.ConversationCursor.ConversationProvider;
|
||||||
|
|
||||||
import java.lang.Override;
|
import java.lang.Override;
|
||||||
|
@ -23,10 +24,13 @@ import java.lang.Override;
|
||||||
public class EmailConversationProvider extends ConversationProvider {
|
public class EmailConversationProvider extends ConversationProvider {
|
||||||
// The authority of our conversation provider (a forwarding provider)
|
// The authority of our conversation provider (a forwarding provider)
|
||||||
// This string must match the declaration in AndroidManifest.xml
|
// This string must match the declaration in AndroidManifest.xml
|
||||||
private static final String sAuthority = "com.android.email2.conversation.provider";
|
private static String sAuthority;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getAuthority() {
|
protected String getAuthority() {
|
||||||
|
if (sAuthority == null) {
|
||||||
|
sAuthority = getContext().getString(R.string.authority_conversation_provider);
|
||||||
|
}
|
||||||
return sAuthority;
|
return sAuthority;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -20,19 +20,23 @@ import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
|
|
||||||
|
import com.android.email.R;
|
||||||
import com.android.email.activity.setup.AccountSettings;
|
import com.android.email.activity.setup.AccountSettings;
|
||||||
|
|
||||||
public class EmailAccountCacheProvider extends MailAppProvider {
|
public class EmailAccountCacheProvider extends MailAppProvider {
|
||||||
// Content provider for Email
|
// Content provider for Email
|
||||||
private static final String sAuthority = "com.android.email2.accountcache";
|
private static String sAuthority;
|
||||||
/**
|
/**
|
||||||
* Authority for the suggestions provider. This is specified in AndroidManifest.xml and
|
* Authority for the suggestions provider. This is specified in AndroidManifest.xml and
|
||||||
* res/xml/searchable.xml.
|
* res/xml/searchable.xml.
|
||||||
*/
|
*/
|
||||||
private static final String sSuggestionsAuthority = "com.android.email.suggestionsprovider";
|
private static String sSuggestionsAuthority;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getAuthority() {
|
protected String getAuthority() {
|
||||||
|
if (sAuthority == null) {
|
||||||
|
sAuthority = getContext().getString(R.string.authority_account_cache_provider);
|
||||||
|
}
|
||||||
return sAuthority;
|
return sAuthority;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,6 +51,9 @@ public class EmailAccountCacheProvider extends MailAppProvider {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getSuggestionAuthority() {
|
public String getSuggestionAuthority() {
|
||||||
|
if (sSuggestionsAuthority == null) {
|
||||||
|
sSuggestionsAuthority = getContext().getString(R.string.authority_suggestions_provider);
|
||||||
|
}
|
||||||
return sSuggestionsAuthority;
|
return sSuggestionsAuthority;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue