diff options
| author | Yu Ping Hu <yph@google.com> | 2013-07-26 23:38:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-26 23:38:44 +0000 |
| commit | 30b28286aade0d45cf37b7f27057c1b89b8e18bd (patch) | |
| tree | 3f7c66a664260883128409e73bdebe634054bfce | |
| parent | afe097f318a7eeac9d240d2bedbc5caba7640ea8 (diff) | |
| parent | 47bcb5a21a20ad59035ec4218e24cd45f1d49667 (diff) | |
| download | android_packages_apps_Email-30b28286aade0d45cf37b7f27057c1b89b8e18bd.tar.gz android_packages_apps_Email-30b28286aade0d45cf37b7f27057c1b89b8e18bd.tar.bz2 android_packages_apps_Email-30b28286aade0d45cf37b7f27057c1b89b8e18bd.zip | |
Merge "Cleanup service loading." into jb-ub-mail-ur10
| -rw-r--r-- | res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | src/com/android/email/service/EmailServiceUtils.java | 16 |
2 files changed, 0 insertions, 18 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 728c00e99..bd6292462 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -26,7 +26,6 @@ <attr name="name" format="string"/> <attr name="hide" format="boolean"/> <attr name="accountType" format="string"/> - <attr name="replaceWith" format="string"/> <attr name="serviceClass" format="string"/> <attr name="intent" format="string"/> <attr name="port" format="integer"/> @@ -66,7 +65,6 @@ <enum name="mins60" value="60"/> </attr> <attr name="inferPrefix" format="string"/> - <attr name="requiresAccountUpdate" format="boolean"/> <attr name="requiresSetup" format="boolean"/> </declare-styleable> </resources> diff --git a/src/com/android/email/service/EmailServiceUtils.java b/src/com/android/email/service/EmailServiceUtils.java index eebe5d936..f20498d23 100644 --- a/src/com/android/email/service/EmailServiceUtils.java +++ b/src/com/android/email/service/EmailServiceUtils.java @@ -175,7 +175,6 @@ public class EmailServiceUtils { public CharSequence[] syncIntervals; public int defaultSyncInterval; public String inferPrefix; - public boolean requiresAccountUpdate; public boolean offerLoadMore; public boolean requiresSetup; public boolean hide; @@ -425,21 +424,6 @@ public class EmailServiceUtils { final TypedArray ta = res.obtainAttributes(xml, R.styleable.EmailServiceInfo); info.protocol = ta.getString(R.styleable.EmailServiceInfo_protocol); info.accountType = ta.getString(R.styleable.EmailServiceInfo_accountType); - // Protocol upgrades are handled by the upgrade broadcast receiver. - // However, we still create the entry from the old protocol to the new type. - // TODO: Remove the need for this entry. - final String newProtocol = - ta.getString(R.styleable.EmailServiceInfo_replaceWith); - - if (newProtocol != null) { - final EmailServiceInfo newInfo = getServiceInfo(context, newProtocol); - if (newInfo == null) { - throw new IllegalStateException( - "Replacement service not found: " + newProtocol); - } - sServiceMap.put(info.protocol, newInfo); - continue; - } info.name = ta.getString(R.styleable.EmailServiceInfo_name); info.hide = ta.getBoolean(R.styleable.EmailServiceInfo_hide, false); final String klass = ta.getString(R.styleable.EmailServiceInfo_serviceClass); |