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

Merge "Cleanup service loading." into jb-ub-mail-ur10

Browse Source
This commit is contained in:
Yu Ping Hu 2013-07-26 23:38:44 +00:00 committed by Android (Google) Code Review
commit 30b28286aa
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/attrs.xml
View File

@ -26,7 +26,6 @@
<attr name="name" format="string"/> <attr name="name" format="string"/>
<attr name="hide" format="boolean"/> <attr name="hide" format="boolean"/>
<attr name="accountType" format="string"/> <attr name="accountType" format="string"/>
<attr name="replaceWith" format="string"/>
<attr name="serviceClass" format="string"/> <attr name="serviceClass" format="string"/>
<attr name="intent" format="string"/> <attr name="intent" format="string"/>
<attr name="port" format="integer"/> <attr name="port" format="integer"/>
@ -66,7 +65,6 @@
<enum name="mins60" value="60"/> <enum name="mins60" value="60"/>
</attr> </attr>
<attr name="inferPrefix" format="string"/> <attr name="inferPrefix" format="string"/>
<attr name="requiresAccountUpdate" format="boolean"/>
<attr name="requiresSetup" format="boolean"/> <attr name="requiresSetup" format="boolean"/>
</declare-styleable> </declare-styleable>
</resources> </resources>

16
src/com/android/email/service/EmailServiceUtils.java
View File

@ -175,7 +175,6 @@ public class EmailServiceUtils {
public CharSequence[] syncIntervals; public CharSequence[] syncIntervals;
public int defaultSyncInterval; public int defaultSyncInterval;
public String inferPrefix; public String inferPrefix;
public boolean requiresAccountUpdate;
public boolean offerLoadMore; public boolean offerLoadMore;
public boolean requiresSetup; public boolean requiresSetup;
public boolean hide; public boolean hide;
@ -425,21 +424,6 @@ public class EmailServiceUtils {
final TypedArray ta = res.obtainAttributes(xml, R.styleable.EmailServiceInfo); final TypedArray ta = res.obtainAttributes(xml, R.styleable.EmailServiceInfo);
info.protocol = ta.getString(R.styleable.EmailServiceInfo_protocol); info.protocol = ta.getString(R.styleable.EmailServiceInfo_protocol);
info.accountType = ta.getString(R.styleable.EmailServiceInfo_accountType); 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.name = ta.getString(R.styleable.EmailServiceInfo_name);
info.hide = ta.getBoolean(R.styleable.EmailServiceInfo_hide, false); info.hide = ta.getBoolean(R.styleable.EmailServiceInfo_hide, false);
final String klass = ta.getString(R.styleable.EmailServiceInfo_serviceClass); final String klass = ta.getString(R.styleable.EmailServiceInfo_serviceClass);