Add Exchange fallback and support diverting to Gmail

b/16679701

Change-Id: I59d7cb4a803f0ad8e782614d0c6cc635318d2375
(cherry picked from commit d039322f7402ef402eb66c92b899510dd6649e2d)

2 files changed, 27 insertions, 18 deletions

diff --git a/res/xml/providers.xml b/res/xml/providers.xml
index f141a34a7..0fa7f2fdc 100644
--- a/res/xml/providers.xml
+++ b/res/xml/providers.xml
@@ -179,62 +179,65 @@
     </provider>
 
     <!-- Hotmail and variants.  NOTE: These are handled by exchange if available, else POP3. -->
-    <!-- EXCHANGE-REMOVE-SECTION-START -->
     <provider id="live1" label="Windows Live Hotmail Plus" domain="live.*">
         <incoming uri="eas+ssl+://m.hotmail.com"  username="$email" />
         <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" />
+        <incoming-fallback uri="imap+ssl+://imap-mail.outlook.com" username="$email" />
+        <outgoing-fallback uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
     </provider>
     <provider id="live2" label="Windows Live Hotmail Plus" domain="live.*.*">
         <incoming uri="eas+ssl+://m.hotmail.com"  username="$email" />
         <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" />
+        <incoming-fallback uri="imap+ssl+://imap-mail.outlook.com" username="$email" />
+        <outgoing-fallback uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
     </provider>
     <provider id="live3" label="Windows Live Hotmail Plus" domain="*.live.*">
         <incoming uri="eas+ssl+://m.hotmail.com"  username="$email" />
         <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" />
+        <incoming-fallback uri="imap+ssl+://imap-mail.outlook.com" username="$email" />
+        <outgoing-fallback uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
     </provider>
     <provider id="hotmail1" label="Windows Live Hotmail Plus" domain="hotmail.*">
         <incoming uri="eas+ssl+://m.hotmail.com"  username="$email" />
         <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" />
+        <incoming-fallback uri="imap+ssl+://imap-mail.outlook.com" username="$email" />
+        <outgoing-fallback uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
     </provider>
     <provider id="hotmail2" label="Windows Live Hotmail Plus" domain="hotmail.*.*">
         <incoming uri="eas+ssl+://m.hotmail.com"  username="$email" />
         <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" />
+        <incoming-fallback uri="imap+ssl+://imap-mail.outlook.com" username="$email" />
+        <outgoing-fallback uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
     </provider>
     <provider id="hotmail3" label="Windows Live Hotmail Plus" domain="livemail.*">
         <incoming uri="eas+ssl+://m.hotmail.com"  username="$email" />
         <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" />
+        <incoming-fallback uri="imap+ssl+://imap-mail.outlook.com" username="$email" />
+        <outgoing-fallback uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
     </provider>
     <provider id="hotmail4" label="Windows Live Hotmail Plus" domain="livemail.*.*">
         <incoming uri="eas+ssl+://m.hotmail.com"  username="$email" />
         <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" />
+        <incoming-fallback uri="imap+ssl+://imap-mail.outlook.com" username="$email" />
+        <outgoing-fallback uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
     </provider>
     <provider id="msn" label="Windows Live Hotmail Plus" domain="msn.*">
         <incoming uri="eas+ssl+://m.hotmail.com"  username="$email" />
         <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" />
+        <incoming-fallback uri="imap+ssl+://imap-mail.outlook.com" username="$email" />
+        <outgoing-fallback uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
     </provider>
     <provider id="msnhotmail" label="Windows Live Hotmail Plus" domain="msnhotmail.com">
         <incoming uri="eas+ssl+://m.hotmail.com"  username="$email" />
         <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" />
+        <incoming-fallback uri="imap+ssl+://imap-mail.outlook.com" username="$email" />
+        <outgoing-fallback uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
     </provider>
         <provider id="outlook" label="Outlook" domain="outlook.com">
         <incoming uri="eas+ssl+://m.hotmail.com"  username="$email" />
         <outgoing uri="eas+ssl+://m.hotmail.com" username="$email" />
-    </provider>
-    <!-- EXCHANGE-REMOVE-SECTION-END -->
-    <provider id="live" label="Windows Live Hotmail Plus" domain="live.com"
-            note="@string/provider_note_live">
-        <incoming uri="pop3+ssl+://pop3.live.com"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.live.com" username="$email" />
-    </provider>
-    <provider id="hotmail" label="Windows Live Hotmail Plus" domain="hotmail.com"
-            note="@string/provider_note_live">
-        <incoming uri="pop3+ssl+://pop3.live.com"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.live.com" username="$email" />
-    </provider>
-    <provider id="msn" label="Windows Live Hotmail Plus" domain="msn.com"
-            note="@string/provider_note_live">
-        <incoming uri="pop3+ssl+://pop3.live.com"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.live.com" username="$email" />
+            <incoming-fallback uri="imap+ssl+://imap-mail.outlook.com" username="$email" />
+            <outgoing-fallback uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
     </provider>
 
     <!-- Yahoo! Mail variants -->
diff --git a/res/xml/services.xml b/res/xml/services.xml
index 86aca05f5..6059a6218 100644
--- a/res/xml/services.xml
+++ b/res/xml/services.xml
@@ -110,5 +110,11 @@
         email:syncContacts="true"
         email:syncCalendar="true"
         email:offerMoveTo="true"
-         />
+        />
+    <emailservice
+        email:protocol="gmail"
+        email:name="@string/gmail_name"
+        email:isGmailStub="true"
+        email:hide="true"
+        />
 </emailservices>