summaryrefslogtreecommitdiff
path: root/res/xml
diff options
context:
space:
mode:
authorMarc Blank <mblank@google.com>2010-07-08 10:08:47 -0700
committerMarc Blank <mblank@google.com>2010-07-21 19:01:41 -0700
commit2674530d1879be7ae2df5105f07a93a5557ec389 (patch)
tree2e4b95cd97aad072a51acb37217d0d315e5d94c9 /res/xml
parente46d87b3c94a22c7ecee5e8d2fe2380ff3efa14a (diff)
downloadExchange-2674530d1879be7ae2df5105f07a93a5557ec389.tar.gz
Use AccountManager for POP/IMAP; refactor setup classes
There are two major, interrelated parts to this CL: 1) Clean up the activities to reduce the use of Intents to pass information between activities; instead, we use a common SetupData structure that automatically saved/restored as necessary during the setup flow. A fair amount of code and inconsistent use of Bundle extras has been eliminated in the process. * Create SetupData structure, setters/getters, and initialization methods to simplify the preservation of state during setup flow * Remove all state/flow extras from Intents; Intents now only specify the Activity to be started, which should greatly simplify the transition to Fragments. * Remove all state/flow fields from Activities * Modify existing setup activity unit tests and confirm tests pass 2) Create AccountManager accounts for POP/IMAP email accounts to provide consistency in user experience. Also, internal flows are now identical as between account types. * Move account reconciliation from SyncManager to MailService, so that reconciliation is consistent between email and exchange accounts; move unit tests as appropriate * Add a "Sync Email" setting for POP/IMAP/EAS * Change MailService to respect the "Sync Email" setting in Settings -> Accounts & sync * Create PopImapSyncAdapterService to handle manual POP/IMAP sync as requested by SyncManager; add EmailSyncAdapterService to perform the same function for EAS * Use new PopImapAuthenticatorService to add AccountManager accounts for POP/IMAP accounts; setup appropriate stanzas in AndroidManifest and add related xml files * Update AccountSettings to use SetupData Miscellaneous other changes: * Only allow valid port numbers in incoming/outgoing setup Bug: 1712475 Change-Id: Ibdac52fb2c5578b86bf3992ddb1acd10f162391a
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/syncadapter_email.xml (renamed from res/xml/authenticator.xml)12
1 files changed, 5 insertions, 7 deletions
diff --git a/res/xml/authenticator.xml b/res/xml/syncadapter_email.xml
index ae82c176..c7ca8509 100644
--- a/res/xml/authenticator.xml
+++ b/res/xml/syncadapter_email.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
- * Copyright (c) 2009, The Android Open Source Project
+ * Copyright (c) 2010, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,12 +18,10 @@
-->
<!-- The attributes in this XML file provide configuration information -->
-<!-- for the Account Manager. -->
+<!-- for the SyncAdapter. -->
-<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
+ android:contentAuthority="com.android.email.provider"
android:accountType="com.android.exchange"
- android:icon="@drawable/ic_exchange_selected"
- android:smallIcon="@drawable/ic_exchange_minitab_selected"
- android:label="@string/exchange_name"
- android:accountPreferences="@xml/account_preferences"
+ android:supportsUploading="false"
/>