ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Use resource based mime type for application" into jb-ub-mail

Browse Source
This commit is contained in:
Marc Blank 2012-09-09 10:15:05 -07:00 committed by Android (Google) Code Review
commit 16b07e11c7
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AndroidManifest.xml
View File

@ -193,7 +193,7 @@
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="content"/>
<data android:mimeType="application/email-ls" />
<data android:mimeType="@string/application_mime_type" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
@ -348,11 +348,11 @@
</intent-filter>
<intent-filter>
<action android:name="com.android.mail.ACTION_NOTIFY_DATASET_CHANGED" />
<data android:mimeType="application/email-ls" />
<data android:mimeType="@string/application_mime_type" />
</intent-filter>
<intent-filter>
<action android:name="com.android.mail.ACTION_UPDATE_WIDGET" />
<data android:mimeType="application/email-ls" />
<data android:mimeType="@string/application_mime_type" />
</intent-filter>
<meta-data android:name="android.appwidget.provider"
android:resource="@xml/widget_info" />
@ -380,7 +380,7 @@
<intent-filter>
<action android:name="com.android.mail.action.update_notification"
android:priority="-10" />
<data android:mimeType="application/email-ls" />
<data android:mimeType="@string/application_mime_type" />
</intent-filter>
<!-- To handle secret code to activate the debug screen. -->
<intent-filter>

2
build/res/values/strings.xml
View File

@ -15,6 +15,7 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- DO NOT TRANSLATE THESE STRINGS -->
<string name="account_manager_type_exchange">com.android.exchange</string>
<string name="account_manager_type_pop3">com.android.pop3</string>
<string name="account_manager_type_imap">com.android.imap</string>
@ -22,4 +23,5 @@
<string name="authority_email_provider">com.android.email.provider</string>
<string name="protocol_imap">imap</string>
<string name="protocol_pop3">pop3</string>
<string name="application_mime_type">application/email-ls</string>
</resources>

3
src/com/android/email/provider/EmailProvider.java
View File

@ -115,7 +115,7 @@ public class EmailProvider extends ContentProvider {
private static final String TAG = "EmailProvider";
public static final String EMAIL_APP_MIME_TYPE = "application/email-ls";
public static String EMAIL_APP_MIME_TYPE;
protected static final String DATABASE_NAME = "EmailProvider.db";
protected static final String BODY_DATABASE_NAME = "EmailProviderBody.db";
@ -1058,6 +1058,7 @@ public class EmailProvider extends ContentProvider {
Uri.parse("content://" + EmailContent.AUTHORITY + "/status");
FOLDER_REFRESH_URI =
Uri.parse("content://" + EmailContent.AUTHORITY + "/refresh");
EMAIL_APP_MIME_TYPE = context.getString(R.string.application_mime_type);
}
MailActivityEmail.setServicesEnabledAsync(context);
checkDatabases();