diff options
| author | Marc Blank <mblank@google.com> | 2012-09-20 13:34:13 -0700 |
|---|---|---|
| committer | Marc Blank <mblank@google.com> | 2012-09-21 08:29:09 -0700 |
| commit | 5c523858385176c33a7456bb84035de78552d22d (patch) | |
| tree | c2f2446c09a417bec52c31c1064c962b0ed5e1c7 /build | |
| parent | ec0af7822c2321cf52b311b2f6bfbc37c9ee14db (diff) | |
| download | android_packages_apps_Email-5c523858385176c33a7456bb84035de78552d22d.tar.gz android_packages_apps_Email-5c523858385176c33a7456bb84035de78552d22d.tar.bz2 android_packages_apps_Email-5c523858385176c33a7456bb84035de78552d22d.zip | |
Restore Imap1
* Restore Imap1 code
* Legacy users will use Imap1
* Existing Imap2 users will continue to use Imap2
* New accounts will be created in Imap1
* More to follow
Bug: 7203993
Change-Id: I8b86fcada59a854fd464d5269c94d00ebae85459
Diffstat (limited to 'build')
| -rw-r--r-- | build/res/values/strings.xml | 7 | ||||
| -rw-r--r-- | build/res/xml/services.xml | 29 |
2 files changed, 16 insertions, 20 deletions
diff --git a/build/res/values/strings.xml b/build/res/values/strings.xml index dc60ac9c3..f0b3eed92 100644 --- a/build/res/values/strings.xml +++ b/build/res/values/strings.xml @@ -17,12 +17,15 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- DO NOT TRANSLATE THESE STRINGS --> <string name="account_manager_type_exchange" translatable="false">com.android.exchange</string> - <string name="account_manager_type_pop3" translatable="false">com.android.pop3</string> - <string name="account_manager_type_imap" translatable="false">com.android.imap</string> + <string name="account_manager_type_pop3" translatable="false">com.android.email</string> + <string name="account_manager_type_imap" translatable="false">com.android.email</string> + <string name="account_manager_type_legacy_imap" translatable="false">com.android.email</string> <string name="intent_exchange" translatable="false">com.android.email.EXCHANGE_INTENT</string> <string name="intent_account_manager_entry" translatable="false">com.android.email.ACCOUNT_MANAGER_ENTRY_INTENT</string> <string name="authority_email_provider" translatable="false">com.android.email.provider</string> + <string name="protocol_legacy_imap" translatable="false">imap</string> <string name="protocol_imap" translatable="false">imap</string> <string name="protocol_pop3" translatable="false">pop3</string> + <string name="protocol_eas" translatable="false">eas</string> <string name="application_mime_type" translatable="false">application/email-ls</string> </resources> diff --git a/build/res/xml/services.xml b/build/res/xml/services.xml index 9af2ae611..a1780e585 100644 --- a/build/res/xml/services.xml +++ b/build/res/xml/services.xml @@ -50,8 +50,8 @@ <emailservices xmlns:email="http://schemas.android.com/apk/res/com.android.email"> <emailservice email:protocol="pop3" - email:name="POP3" - email:accountType="com.android.email" + email:name="@string/pop3_name" + email:accountType="@string/account_manager_type_pop3" email:serviceClass="com.android.email.service.Pop3Service" email:port="110" email:portSsl="995" @@ -66,17 +66,16 @@ email:offerLoadMore="true" /> <emailservice - email:protocol="imap2" - email:name="IMAP" - email:accountType="com.android.imap2" - email:serviceClass="com.android.email.imap2.Imap2SyncManager" + email:protocol="imap" + email:name="@string/imap_name" + email:accountType="@string/account_manager_type_imap" + email:serviceClass="com.android.email.service.ImapService" email:port="143" email:portSsl="993" - email:syncIntervalStrings="@array/account_settings_check_frequency_entries_push" - email:syncIntervals="@array/account_settings_check_frequency_values_push" - email:defaultSyncInterval="push" + email:syncIntervalStrings="@array/account_settings_check_frequency_entries" + email:syncIntervals="@array/account_settings_check_frequency_values" + email:defaultSyncInterval="mins15" - email:offerLookback="true" email:offerTls="true" email:usesSmtp="true" email:offerAttachmentPreload="true" @@ -84,12 +83,11 @@ email:syncChanges="true" email:inferPrefix="imap" email:offerLoadMore="true" - email:requiresSetup="true" /> <emailservice - email:protocol="eas" + email:protocol="@string/protocol_eas" email:name="Exchange" - email:accountType="com.android.exchange" + email:accountType="@string/account_manager_type_exchange" email:intent="com.android.email.EXCHANGE_INTENT" email:port="80" email:portSsl="443" @@ -107,9 +105,4 @@ email:syncContacts="true" email:syncCalendar="true" /> - <emailservice - email:protocol="imap" - email:accountType="com.android.email" - email:replaceWith="imap2" - /> </emailservices> |