am 30b28286
: Merge "Cleanup service loading." into jb-ub-mail-ur10
* commit '30b28286aade0d45cf37b7f27057c1b89b8e18bd': Cleanup service loading.
This commit is contained in:
commit
7f213602cd
@ -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>
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user