diff options
| author | Dmitri Plotnikov <dplotnikov@google.com> | 2009-10-14 07:56:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-14 07:56:55 -0700 |
| commit | 101dbb3e075eb218fe55e47ed1f142a1c2ae664a (patch) | |
| tree | 178bb9dcf8514fef7223ee20e297d713ad6025e7 | |
| parent | 12361f35cdcb8f39f03fd69626a4fc0a72c3c0c4 (diff) | |
| parent | e020ff61750d8b1e9a4d8880391472598af173e3 (diff) | |
| download | frameworks_base-101dbb3e075eb218fe55e47ed1f142a1c2ae664a.zip frameworks_base-101dbb3e075eb218fe55e47ed1f142a1c2ae664a.tar.gz frameworks_base-101dbb3e075eb218fe55e47ed1f142a1c2ae664a.tar.bz2 | |
am e020ff61: am 0a299af2: am fe4c8715: Making new Contacts APIs visible in Eclair SDK - Part II
Merge commit 'e020ff61750d8b1e9a4d8880391472598af173e3'
* commit 'e020ff61750d8b1e9a4d8880391472598af173e3':
Making new Contacts APIs visible in Eclair SDK - Part II
| -rw-r--r-- | api/current.xml | 87 | ||||
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 2 |
2 files changed, 88 insertions, 1 deletions
diff --git a/api/current.xml b/api/current.xml index 898ad73..a175769 100644 --- a/api/current.xml +++ b/api/current.xml @@ -116568,6 +116568,8 @@ deprecated="not deprecated" visibility="public" > +<implements name="android.provider.ContactsContract.SettingsColumns"> +</implements> <field name="CONTENT_ITEM_TYPE" type="java.lang.String" transient="false" @@ -116601,6 +116603,91 @@ > </field> </class> +<interface name="ContactsContract.SettingsColumns" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="protected" +> +<field name="ACCOUNT_NAME" + type="java.lang.String" + transient="false" + volatile="false" + value=""account_name"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACCOUNT_TYPE" + type="java.lang.String" + transient="false" + volatile="false" + value=""account_type"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ANY_UNSYNCED" + type="java.lang.String" + transient="false" + volatile="false" + value=""any_unsynced"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SHOULD_SYNC" + type="java.lang.String" + transient="false" + volatile="false" + value=""should_sync"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="UNGROUPED_COUNT" + type="java.lang.String" + transient="false" + volatile="false" + value=""summ_count"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="UNGROUPED_VISIBLE" + type="java.lang.String" + transient="false" + volatile="false" + value=""ungrouped_visible"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="UNGROUPED_WITH_PHONES" + type="java.lang.String" + transient="false" + volatile="false" + value=""summ_phones"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</interface> <interface name="ContactsContract.StatusColumns" abstract="true" static="true" diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 48e0cd3..7904401 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -2117,7 +2117,7 @@ public final class ContactsContract { public static final String RAW_CONTACT_ID2 = "raw_contact_id2"; } - private interface SettingsColumns { + protected interface SettingsColumns { /** * The name of the account instance to which this row belongs. * <P>Type: TEXT</P> |