Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb7a1446 authored by Daniel Lehmann's avatar Daniel Lehmann Committed by Android (Google) Code Review
Browse files

Merge "Contacts contract changes for social updates."

parents 484738f3 d414f108

api/current.txt

+43 −0
Original line number Original line Diff line number Diff line
@@ -15620,6 +15620,10 @@ package android.provider { 
    field public static final java.lang.String PHOTO = "data15";

    field public static final java.lang.String PHOTO = "data15";

  }

  }




















  public static final class ContactsContract.Contacts.StreamItems implements android.provider.ContactsContract.StreamItemsColumns {














    field public static final java.lang.String CONTENT_DIRECTORY = "stream_items";














  }
























  protected static abstract interface ContactsContract.ContactsColumns {







  protected static abstract interface ContactsContract.ContactsColumns {











    field public static final java.lang.String DISPLAY_NAME = "display_name";







    field public static final java.lang.String DISPLAY_NAME = "display_name";











    field public static final java.lang.String HAS_PHONE_NUMBER = "has_phone_number";







    field public static final java.lang.String HAS_PHONE_NUMBER = "has_phone_number";










@@ -15853,6 +15857,10 @@ package android.provider {









    field public static final java.lang.String DATA_ID = "data_id";







    field public static final java.lang.String DATA_ID = "data_id";











  }







  }






























  public static final class ContactsContract.RawContacts.StreamItems implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemsColumns {














    field public static final java.lang.String CONTENT_DIRECTORY = "stream_items";














  }
























  protected static abstract interface ContactsContract.RawContactsColumns {







  protected static abstract interface ContactsContract.RawContactsColumns {











    field public static final java.lang.String AGGREGATION_MODE = "aggregation_mode";







    field public static final java.lang.String AGGREGATION_MODE = "aggregation_mode";











    field public static final java.lang.String CONTACT_ID = "contact_id";







    field public static final java.lang.String CONTACT_ID = "contact_id";










@@ -15912,6 +15920,41 @@ package android.provider {









    field public static final android.net.Uri CONTENT_URI;







    field public static final android.net.Uri CONTENT_URI;











  }







  }






























  public static final class ContactsContract.StreamItemPhotos implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemPhotosColumns {














  }



























  protected static abstract interface ContactsContract.StreamItemPhotosColumns {














    field public static final java.lang.String ACTION = "action";














    field public static final java.lang.String ACTION_URI = "action_uri";














    field public static final java.lang.String PICTURE = "picture";














    field public static final java.lang.String SORT_INDEX = "sort_index";














    field public static final java.lang.String STREAM_ITEM_ID = "stream_item_id";














  }



























  public static final class ContactsContract.StreamItems implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemsColumns {














    field public static final android.net.Uri CONTENT_LIMIT_URI;














    field public static final android.net.Uri CONTENT_PHOTO_URI;














    field public static final android.net.Uri CONTENT_URI;














    field public static final java.lang.String MAX_ITEMS = "max_items";














    field public static final java.lang.String PHOTO_MAX_BYTES = "photo_max_bytes";














  }



























  public static final class ContactsContract.StreamItems.StreamItemPhotos implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemPhotosColumns {














    field public static final java.lang.String CONTENT_DIRECTORY = "photo";














  }



























  protected static abstract interface ContactsContract.StreamItemsColumns {














    field public static final java.lang.String ACTION = "action";














    field public static final java.lang.String ACTION_URI = "action_uri";














    field public static final java.lang.String COMMENTS = "comments";














    field public static final java.lang.String RAW_CONTACT_ID = "raw_contact_id";














    field public static final java.lang.String RES_ICON = "icon";














    field public static final java.lang.String RES_LABEL = "label";














    field public static final java.lang.String RES_PACKAGE = "res_package";














    field public static final java.lang.String TEXT = "text";














    field public static final java.lang.String TIMESTAMP = "timestamp";














  }
























  protected static abstract interface ContactsContract.SyncColumns implements android.provider.ContactsContract.BaseSyncColumns {







  protected static abstract interface ContactsContract.SyncColumns implements android.provider.ContactsContract.BaseSyncColumns {











    field public static final java.lang.String ACCOUNT_NAME = "account_name";







    field public static final java.lang.String ACCOUNT_NAME = "account_name";











    field public static final java.lang.String ACCOUNT_TYPE = "account_type";







    field public static final java.lang.String ACCOUNT_TYPE = "account_type";

























core/java/android/provider/ContactsContract.java



+516
−0


























File changed.
Preview size limit exceeded, changes collapsed.